diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 6062b9679..62d8c8519 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -1050,7 +1050,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl0) { - map.put("deptId", formDTO.getDeptIdList().get(0)); + map.put("deptId", formDTO.getDeptIdList()); } if (formDTO.getDeptName() != null && formDTO.getDeptName() != "") { map.put("deptName", formDTO.getDeptName()); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 3dab02746..f1e41a5a4 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -324,9 +324,19 @@ AND sd.type_key = #{typeKey} - - AND instr(sd.id, #{deptId}) > 0 or instr(sd.pid, #{deptId}) > 0 + + AND sd.id IN + + #{deptId} + + OR sd.pid IN + + #{deptId} + + + + AND sd.type_key = #{typeKey} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java index 6611188bd..7176df09b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/ManualScoreServiceImpl.java @@ -164,19 +164,14 @@ public class ManualScoreServiceImpl extends BaseServiceImpl dataScopeDeptList = new ArrayList<>(); - - List deptIdList = SecurityUser.getUser().getDeptIdList(); //获取用户权限 - UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO(); - userSysDeptInfoFormDTO.setDeptIdList(deptIdList); - Result> deptTypeKeys =adminFeignClient.queryUserSysDeptTypeKey(userSysDeptInfoFormDTO); - if (!("".equals(params.get("deptId")))){ //根据选择部门 项导出模板 - for (int i = 0; i < deptTypeKeys.getData().size(); i++){ - if (deptType.equals(deptTypeKeys.getData().get(i).getTypeKey())){ - dataScopeDeptList.add(deptTypeKeys.getData().get(i).getId()); - } - } + long deptId = Long.valueOf(params.get("deptId").toString()); + dataScopeDeptList.add(deptId); } else { //根据默认数据权限导出模板 + List deptIdList = SecurityUser.getUser().getDeptIdList(); //获取用户权限 + UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO(); + userSysDeptInfoFormDTO.setDeptIdList(deptIdList); + Result> deptTypeKeys =adminFeignClient.queryUserSysDeptTypeKey(userSysDeptInfoFormDTO); for (int i = 0; i < deptTypeKeys.getData().size(); i++){ if (deptType.equals(deptTypeKeys.getData().get(i).getTypeKey())){ dataScopeDeptList.add(deptTypeKeys.getData().get(i).getId());