修改代码

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/CompleteRequisiteInfoDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -36,13 +37,12 @@ public class CompleteRequisiteInfoDTO implements Serializable {
     @NotBlank(message = "企业地址不能为空")
     private String enterpriseAddress;
 
-    @NotBlank(message = "居住网格ID不能为空")
+    @NotNull(message = "居住网格ID不能为空")
     private Long deptId;
 
     /**
      * 企业id（修改时必填）
      */
-
     private String id;
 
     @NotBlank(message = "手机号验证码不能为空")

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java

@@ -137,21 +137,25 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
     @Override
     public Result completeRequisiteInfo(CompleteRequisiteInfoDTO fromDto) {
         //保存到企业数据库
-        EnterpriseInfoDTO enterpriseInfoDTO = ConvertUtils.sourceToTarget(fromDto, EnterpriseInfoDTO.class);
+        EnterpriseInfoEntity enterpriseInfo = ConvertUtils.sourceToTarget(fromDto, EnterpriseInfoEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(fromDto.getDeptId()));
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
         } else {
             ParentAndAllDeptDTO deptDTO = parentResult.getData();
-            enterpriseInfoDTO.setAllDeptIds(deptDTO.getAllDeptIds());
-            enterpriseInfoDTO.setAllDeptNames(deptDTO.getAllDeptNames());
-            enterpriseInfoDTO.setParentDeptIds(deptDTO.getParentDeptIds());
-            enterpriseInfoDTO.setParentDeptNames(deptDTO.getParentDeptNames());
+            enterpriseInfo.setAllDeptIds(deptDTO.getAllDeptIds());
+            enterpriseInfo.setAllDeptNames(deptDTO.getAllDeptNames());
+            enterpriseInfo.setParentDeptIds(deptDTO.getParentDeptIds());
+            enterpriseInfo.setParentDeptNames(deptDTO.getParentDeptNames());
+        }
+        if (StringUtils.isNotBlank(fromDto.getId())) {
+            baseDao.updateById(enterpriseInfo);
+        } else {
+            baseDao.insert(enterpriseInfo);
         }
-        save(enterpriseInfoDTO);
         //更新用户表数据
         CompleteRequisiteUserInfoDTO userInfoDTO = ConvertUtils.sourceToTarget(fromDto, CompleteRequisiteUserInfoDTO.class);
-        userInfoDTO.setDwellingPlace(enterpriseInfoDTO.getEnterpriseAddress());
+        userInfoDTO.setDwellingPlace(enterpriseInfo.getEnterpriseAddress());
         userFeignClient.completeRequisiteInfo(userInfoDTO);
         return new Result();
     }