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 38a39f9..7391603 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 @@ -191,11 +191,13 @@ public class StudySubjectServiceImpl extends ServiceImpl formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ formData.put("新增人员", String.join(",",addNameList)); - formDataEn.put("Add Person", String.join(",",addNameEnList)); +// formDataEn.put("Add Person", String.join(",",addNameEnList)); + formDataEn.put("Add Person", String.join(",",addNameList)); } if(deleteNameList.size()>0){ formData.put("删除人员", String.join(",",deleteNameList)); - formDataEn.put("Remove Person", String.join(",",deleteNameEnList)); +// formDataEn.put("Remove Person", String.join(",",deleteNameEnList)); + formDataEn.put("Remove Person", String.join(",",deleteNameList)); } 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 9c92454..f484324 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 @@ -133,11 +133,13 @@ public class StudySubjectUserServiceImpl extends ServiceImpl formDataEn = new LinkedHashMap<>(); if(addNameList.size()>0){ formData.put("新增人员", String.join(",",addNameList)); - formDataEn.put("Add Person", String.join(",",addNameEnList)); +// formDataEn.put("Add Person", String.join(",",addNameEnList)); + formDataEn.put("Add Person", String.join(",",addNameList)); } if(deleteNameList.size()>0){ formData.put("删除人员", String.join(",",deleteNameList)); - formDataEn.put("Remove Person", String.join(",",deleteNameEnList)); +// formDataEn.put("Remove Person", String.join(",",deleteNameEnList)); + formDataEn.put("Remove Person", String.join(",",deleteNameList)); } 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":""); @@ -157,7 +159,8 @@ public class StudySubjectUserServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); formData.put("删除人员", String.join(",",deleteNameList)); - formDataEn.put("Remove Person", String.join(",",deleteNameEnList)); +// formDataEn.put("Remove Person", String.join(",",deleteNameEnList)); + formDataEn.put("Remove Person", String.join(",",deleteNameList)); 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/system/controller/SysUserController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java index a359583..3c05017 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/controller/SysUserController.java @@ -462,6 +462,7 @@ public class SysUserController extends BaseController if(study==null){ return AjaxResult.error("信息不存在"); } + //试验学科内部的人+非试验部门内的人+麻精药不用判断(只需要判断有审核按钮) List depts = userService.selectStudyUser(study.getType().equals(StudyTypeEnum.sy.getValue())?studyId:null,study.getType().equals(StudyTypeEnum.sy.getValue())?studySubjectId:null,study.getDeptId(),permit); return success(depts); }