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