From 8792dbc0882e95a2ec2784fef3a6472159ac85d4 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 2 Apr 2020 12:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E5=90=B9?=
 =?UTF-8?q?=E5=93=A8=E9=83=A8=E9=97=A8=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/SysRoleServiceImpl.java | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
index 52e60d36..de801868 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java
@@ -212,19 +212,22 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         HandleRoleDeptFormDTO formDTO = new HandleRoleDeptFormDTO();
         formDTO.setRoleId(roleId.toString());
 
-        QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
-        wrapper.in(FieldConstant.ID, whistleDeptIdList);
-        List<SysDeptEntity> deptEntityList = sysDeptDao.selectList(wrapper);
-        List<HandleRoleDeptDTO> formDTOList = new ArrayList<>();
-        for (SysDeptEntity dept : deptEntityList) {
-            HandleRoleDeptDTO handleRoleDeptDTO = new HandleRoleDeptDTO();
-            handleRoleDeptDTO.setDeptId(dept.getId().toString());
-            handleRoleDeptDTO.setDeptName(dept.getName());
-            handleRoleDeptDTO.setDeptType(dept.getTypeKey());
-            handleRoleDeptDTO.setRoleId(roleId.toString());
-            formDTOList.add(handleRoleDeptDTO);
+        if (null == whistleDeptIdList || whistleDeptIdList.size() == 0) {
+            QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
+            wrapper.in(FieldConstant.ID, whistleDeptIdList);
+            List<SysDeptEntity> deptEntityList = sysDeptDao.selectList(wrapper);
+            List<HandleRoleDeptDTO> formDTOList = new ArrayList<>();
+            for (SysDeptEntity dept : deptEntityList) {
+                HandleRoleDeptDTO handleRoleDeptDTO = new HandleRoleDeptDTO();
+                handleRoleDeptDTO.setDeptId(dept.getId().toString());
+                handleRoleDeptDTO.setDeptName(dept.getName());
+                handleRoleDeptDTO.setDeptType(dept.getTypeKey());
+                handleRoleDeptDTO.setRoleId(roleId.toString());
+                formDTOList.add(handleRoleDeptDTO);
+            }
+            formDTO.setHandleRoleDeptDTOList(formDTOList);
         }
-        formDTO.setHandleRoleDeptDTOList(formDTOList);
+
         eventFeignClient.saveOrUpdateHandleRoleDept(formDTO);
     }
 }