From 32d8f9ee8419b6f78ae6aa71a48da16c3dabb2e2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 28 Apr 2020 10:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8=E4=B8=8B?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=A7=92=E8=89=B2=E6=94=B9=E7=94=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87Id,=E4=B8=8D=E8=83=BD=E7=94=A8=E9=83=A8=E9=97=A8Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DepartmentServiceImpl.java | 1 + .../java/com/epmet/dto/form/DepartmentInStaffFormDTO.java | 5 +++++ .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 15cde80e98..07dcc028ee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -168,6 +168,7 @@ public class DepartmentServiceImpl implements DepartmentService { } DepartmentInStaffFormDTO departmentInStaffFormDTO = new DepartmentInStaffFormDTO(); //部门Id用于查询部门领导角色使用 + departmentInStaffFormDTO.setAgencyId(entity.getAgencyId()); departmentInStaffFormDTO.setDepartmentId(formDTO.getDepartmentId()); departmentInStaffFormDTO.setCustomerId(entity.getCustomerId()); departmentInStaffFormDTO.setUserIdList(userIdList); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java index 5810659515..bad1e30b62 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java @@ -14,6 +14,11 @@ public class DepartmentInStaffFormDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 组织Id + */ + private String agencyId; + /** * 部门Id */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index c7049bfaf8..7b7603b823 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -382,9 +382,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> getDepartmentStaffList(DepartmentInStaffFormDTO formDTO) { //1:根据userId集合查询人员基本信息 List staffList = baseDao.selectDepartmentStaffList(formDTO); - //2:根据部门Id查询部门下是领导角色的用户 + //2:根据组织Id查询部门下是领导角色的用户 StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); - staffRoleFormDTO.setOrgId(formDTO.getDepartmentId()); + staffRoleFormDTO.setOrgId(formDTO.getAgencyId()); staffRoleFormDTO.setRoleKey(UserRoleConstant.DEPT_LEADER); List staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getDepartmentId(), DataScope.getDefault()); staffRoleDTOS.forEach(roleDto -> {