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 84c9c61ff..13acbf811 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 @@ -54,13 +54,12 @@ public class CustomServiceImpl implements CustomService { // 获取部门冗余信息 if (null != formDTO.getDeptId()) { Result pidInfoResult = adminFeignClient.getParentAndAllDept(formDTO.getDeptId()); - if (!pidInfoResult.success()) { - return new Result().error("获取部门信息失败" + pidInfoResult.getMsg()); + if (pidInfoResult.success() && null != pidInfoResult.getData()) { + 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); } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java index c95f7cb57..477e09ba8 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpiDemicReportFormDTO.java @@ -13,11 +13,6 @@ import java.io.Serializable; @Data public class EpiDemicReportFormDTO implements Serializable { private static final long serialVersionUID = 2379520294973498819L; - /** - * 是否是网格党建指导员(0:否,1:是) - */ - @NotBlank(message = "网格党建指导员标识不能为空") - private String instructorFlag; /** * 部门ID