From 17fbda2d4745024e851b767397dac6c5f6329294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com>
Date: Tue, 9 Aug 2022 14:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/system/mapper/mapping/DeptMapMapper.xml  | 2 +-
 .../com/njcn/system/service/impl/DeptMapServiceImpl.java   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml
index 9f3993756..a05d09f17 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml
@@ -14,7 +14,7 @@
     <select id="selectDeptListName" resultType="Dept">
         SELECT `Id` deptId, `Name` deptName
         FROM sys_dept
-        WHERE Id IN
+        WHERE State = 1 AND Id IN
         <foreach item="item" collection="deptIndexes" open="(" separator="," close=")">
             #{item}
         </foreach>
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java
index 4aa7a8f62..8da6513a1 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DeptMapServiceImpl.java
@@ -43,8 +43,10 @@ public class DeptMapServiceImpl implements DeptMapService {
             for (DeptMap dept: deptMaps) {
                 DeptConfigVO configVO = new DeptConfigVO();
                 BeanUtils.copyProperties(dept, configVO);
-                configVO.setDeptName(
-                deptList.stream().filter(item -> item.getDeptId().equals(configVO.getDeptId())).collect(Collectors.toList()).get(0).getDeptName());
+                List<Dept> deptData = deptList.stream().filter(item -> item.getDeptId().equals(configVO.getDeptId())).collect(Collectors.toList());
+                if (!CollectionUtils.isEmpty(deptData)) {
+                    configVO.setDeptName(deptData.get(0).getDeptName());
+                }
                 deptConfigVOS.add(configVO);
             }
             return deptConfigVOS;
@@ -96,7 +98,6 @@ public class DeptMapServiceImpl implements DeptMapService {
         } else {
             throw new BusinessException(CommonResponseEnum.DEPT_BINDED);
         }
-
     }
 
     @Override