diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java index 729bb5b39..f35956284 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/DeptController.java +++ b/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 */ diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java index c815504df..3b104a6bb 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java @@ -326,18 +326,18 @@ public class DeptServiceImpl extends ServiceImpl implements ID @Override public List getDepSonIdtByDeptId(String id) { List sonIds = this.baseMapper.getDeptSonIds(id); - if(CollectionUtil.isNotEmpty(sonIds)){ - sonIds.add(id); - } + sonIds.add(id); return sonIds; } @Override public List getDepSonSelfCodetByDeptId(String id) { - List 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 sonIds = this.baseMapper.getDeptSonSlfeIds(id); + sonIds.add(dept.getCode()); return sonIds; }