diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java index 880fd4622..84c9c61ff 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java @@ -52,14 +52,16 @@ public class CustomServiceImpl implements CustomService { // 验证手机号 this.checkSmsCode(formDTO.getMobile(), formDTO.getSmsCode()); // 获取部门冗余信息 - Result pidInfoResult = adminFeignClient.getParentAndAllDept(formDTO.getDeptId()); - if (!pidInfoResult.success()) { - return new Result().error("获取部门信息失败" + pidInfoResult.getMsg()); + if (null != formDTO.getDeptId()) { + Result pidInfoResult = adminFeignClient.getParentAndAllDept(formDTO.getDeptId()); + if (!pidInfoResult.success()) { + return new Result().error("获取部门信息失败" + pidInfoResult.getMsg()); + } + formDTO.setParentDeptIds(pidInfoResult.getData().getParentDeptIds()); + formDTO.setParentDeptNames(pidInfoResult.getData().getParentDeptNames()); + formDTO.setAllDeptIds(pidInfoResult.getData().getAllDeptIds()); + formDTO.setAllDeptNames(pidInfoResult.getData().getAllDeptNames()); } - formDTO.setParentDeptIds(pidInfoResult.getData().getParentDeptIds()); - formDTO.setParentDeptNames(pidInfoResult.getData().getParentDeptNames()); - formDTO.setAllDeptIds(pidInfoResult.getData().getAllDeptIds()); - formDTO.setAllDeptNames(pidInfoResult.getData().getAllDeptNames()); return customFeignClient.report(formDTO); }