添加非空判断

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>

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());
     }