部门代码调整

pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java

@@ -314,7 +314,7 @@ public class DeptController extends BaseController {
     }
 
     /**
-     * 根据部门id获取所有子部门的code
+     * 根据部门id获取所有子部门的code(pms项目专用)
      * @author cdf
      * @date 2022/11/25
      */

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java

@@ -326,18 +326,18 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
     @Override
     public List<String> getDepSonIdtByDeptId(String id) {
         List<String> sonIds = this.baseMapper.getDeptSonIds(id);
-        if(CollectionUtil.isNotEmpty(sonIds)){
-            sonIds.add(id);
-        }
+        sonIds.add(id);
         return sonIds;
     }
 
     @Override
     public List<String> getDepSonSelfCodetByDeptId(String id) {
-        List<String> sonIds = this.baseMapper.getDeptSonSlfeIds(id);
-        if(CollectionUtil.isNotEmpty(sonIds)){
-            sonIds.add(id);
+        Dept dept = this.getDeptById(id);
+        if(Objects.isNull(dept)){
+            throw new BusinessException(UserResponseEnum.DEPT_MISSING);
         }
+        List<String> sonIds = this.baseMapper.getDeptSonSlfeIds(id);
+        sonIds.add(dept.getCode());
         return sonIds;
     }