From 7ec299eb34900eeba7c55ac775535fcc87534afc Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 13 Jan 2026 11:47:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20=E7=A8=BD=E6=9F=A5=E8=BD=A8=E8=BF=B9=E5=8F=8C=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/StudyServiceImpl.java | 27 ++++++++++++++++++---- .../service/impl/StudySubjectServiceImpl.java | 4 ++-- .../service/impl/StudySubjectUserServiceImpl.java | 6 ++--- .../com/hxhq/business/utils/ObjectCompareUtil.java | 2 +- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java index fcf8775..69668e6 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java @@ -227,9 +227,9 @@ public class StudyServiceImpl extends ServiceImpl implements Map formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); formData.put("新增人员", study.getLeaderName()); - formDataEn.put("Add User", study.getLeaderNameEn()); + formDataEn.put("Add Person", study.getLeaderNameEn()); formData.put("删除人员", old.getLeaderName()); - formDataEn.put("Remove User", old.getLeaderNameEn()); + formDataEn.put("Remove Person", old.getLeaderNameEn()); sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); sign.setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Change of Person":""); if(study.getStatus().equals(StudyStatusEnum.cg.getValue())){ @@ -442,9 +442,26 @@ public class StudyServiceImpl extends ServiceImpl implements } private void checkPermit(Study study){ - String tfmRole = "TFM"; - if(!AuthUtil.hasRole(tfmRole) && !study.getLeader().equals(SecurityUtils.getUserId())){ - throw new ServiceException("没有该试验操作权限"); + if(study.getType().equals(StudyTypeEnum.sy.getValue())){ + //TFM和所属人可以操作 + String tfmRole = "TFM"; + if(!AuthUtil.hasRole(tfmRole) && !study.getLeader().equals(SecurityUtils.getUserId())){ + throw new ServiceException("没有该试验操作权限"); + } + } + if(study.getType().equals(StudyTypeEnum.fsy.getValue())){ + //部长和所属人可以操作 + String bz = "bz"; + if(!AuthUtil.hasRole(bz) && !study.getLeader().equals(SecurityUtils.getUserId())){ + throw new ServiceException("没有该非试验表单操作权限"); + } + } + if(study.getType().equals(StudyTypeEnum.mjy.getValue())){ + //部长和所属人可以操作 + String bz = "bz"; + if(!AuthUtil.hasRole(bz) && !study.getLeader().equals(SecurityUtils.getUserId())){ + throw new ServiceException("没有该麻精药表单操作权限"); + } } } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java index a3d1cb5..de84143 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java @@ -184,11 +184,11 @@ public class StudySubjectServiceImpl extends ServiceImpl formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ formData.put("新增人员", String.join("，",addNameList)); - formDataEn.put("Add User", String.join("，",addNameEnList)); + formDataEn.put("Add Person", String.join("，",addNameEnList)); } if(deleteNameList.size()>0){ formData.put("删除人员", String.join("，",deleteNameList)); - formDataEn.put("Remove User", String.join("，",deleteNameEnList)); + formDataEn.put("Remove Person", String.join("，",deleteNameEnList)); } form.getSign().setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); form.getSign().setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Change of Person":""); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java index 0f897f6..da2fe62 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectUserServiceImpl.java @@ -121,11 +121,11 @@ public class StudySubjectUserServiceImpl extends ServiceImpl formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ formData.put("新增人员", String.join("，",addNameList)); - formDataEn.put("Add User", String.join("，",addNameEnList)); + formDataEn.put("Add Person", String.join("，",addNameEnList)); } if(deleteNameList.size()>0){ formData.put("删除人员", String.join("，",deleteNameList)); - formDataEn.put("Remove User", String.join("，",deleteNameEnList)); + formDataEn.put("Remove Person", String.join("，",deleteNameEnList)); } form.getSign().setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); form.getSign().setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Change of Person":""); @@ -145,7 +145,7 @@ public class StudySubjectUserServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); formData.put("删除人员", String.join("，",deleteNameList)); - formDataEn.put("Remove User", String.join("，",deleteNameEnList)); + formDataEn.put("Remove Person", String.join("，",deleteNameEnList)); sign.setQmyy(study.getType().equals(StudyTypeEnum.sy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.fsy.getValue())?"人员变更":study.getType().equals(StudyTypeEnum.mjy.getValue())?"人员变更":""); sign.setQmyyEn(study.getType().equals(StudyTypeEnum.sy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.fsy.getValue())?"Change of Person":study.getType().equals(StudyTypeEnum.mjy.getValue())?"Change of Person":""); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java index 2345565..e573a5d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/ObjectCompareUtil.java @@ -347,7 +347,7 @@ public class ObjectCompareUtil { public String toEnString(){ Map map = new LinkedHashMap<>(); - map.put("Field Name", fieldLabelEn); + map.put("Field", fieldLabelEn); map.put("Old Value", oldValue); map.put("New Value", newValue); return JctUtil.formatStr(map);