From 480fd9dbb664f7ceb8d0be13b522f595814a95d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 29 Nov 2022 11:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BB=A3=E7=A0=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/user/controller/DeptController.java | 2 +- .../com/njcn/user/service/impl/DeptServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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; }