From b2ad8addcf4885e826b23c6a71e38106bfe3f97c Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Thu, 12 Nov 2020 10:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/deptlevel/controller/OptDeptLevelController.java  | 2 +-
 .../modules/deptlevel/service/impl/OptSysDeptServiceImpl.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java b/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java
index f33d6da..2dafb6d 100644
--- a/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java
+++ b/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/controller/OptDeptLevelController.java
@@ -69,7 +69,7 @@ public class OptDeptLevelController {
     }
 
     /**
-     * 根据部门id 查询部门所有上级机构信息
+     * 根据部门id 查询部门信息及冗余机构信息
      *
      * @param deptId
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO>
diff --git a/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java b/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java
index ebefa2d..413a852 100644
--- a/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java
+++ b/epdc-cloud-optimize-yushan/epdc-optimize-department/src/main/java/com/elink/esua/epdc/optimize/modules/deptlevel/service/impl/OptSysDeptServiceImpl.java
@@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
 import com.elink.esua.epdc.commons.tools.constant.StrConstant;
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
@@ -78,6 +79,9 @@ public class OptSysDeptServiceImpl extends BaseServiceImpl<OptSysDeptDao, OptSys
     @Override
     public DeptLevelAndLeaderDTO getDeptLevelById(Long deptId) {
         OptSysDeptEntity dept = baseDao.selectById(deptId);
+        if (null == dept) {
+            throw new RenException(ErrorCode.INVALID_ERROR, "部门ID");
+        }
         return packCompleteDeptLevel(dept.getId(), dept.getPids());
     }