From 84745c866eff210441a7c8cdd15533638f7b4199 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Wed, 29 Jan 2020 10:12:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=96=AB=E6=83=85=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3deptId=E4=B8=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/CustomServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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); } From a93ec24f4244b9acbfa2e50b67262bd9eef65d13 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Wed, 29 Jan 2020 10:45:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=96=AB=E6=83=85=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8E=BB=E9=99=A4instructorFlag=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/CustomServiceImpl.java | 11 +++++------ .../esua/epdc/dto/form/EpiDemicReportFormDTO.java | 5 ----- 2 files changed, 5 insertions(+), 11 deletions(-) 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