Merge remote-tracking branch 'origin/dev_epidemic' into dev_epidemic

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@@ -52,14 +52,15 @@ public class CustomServiceImpl implements CustomService {
 		// 验证手机号
 		this.checkSmsCode(formDTO.getMobile(), formDTO.getSmsCode());
 		// 获取部门冗余信息
-		Result<ParentAndAllDeptDTO> pidInfoResult = adminFeignClient.getParentAndAllDept(formDTO.getDeptId());
+		if (null != formDTO.getDeptId()) {
-		if (!pidInfoResult.success()) {
+			Result<ParentAndAllDeptDTO> pidInfoResult = adminFeignClient.getParentAndAllDept(formDTO.getDeptId());
-			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);
 	}
 

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