From 82d78e235dfe94de113faf61808f58f5c1544faa Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Sat, 29 Feb 2020 10:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=81=E4=B8=9A=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EnterpriseInfoServiceImpl.java       | 22 ++++++++++++-------
 .../epdc/modules/feign/UserFeignClient.java   |  3 ++-
 .../controller/EpdcAppUserController.java     |  6 ++---
 .../epdc/service/impl/UserServiceImpl.java    |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
index 917ca8da3..142f7685e 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprise/service/impl/EnterpriseInfoServiceImpl.java
@@ -142,7 +142,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
         EnterpriseInfoEntity enterpriseInfo = ConvertUtils.sourceToTarget(fromDto, EnterpriseInfoEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(fromDto.getDeptId()));
 
-        String gridName ;
+        String gridName;
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
         } else {
@@ -153,16 +153,22 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoDao
             enterpriseInfo.setParentDeptNames(deptDTO.getParentDeptNames());
             gridName = deptDTO.getGrid();
         }
-        if (StringUtils.isNotBlank(fromDto.getId())) {
-            baseDao.updateById(enterpriseInfo);
-        } else {
-            baseDao.insert(enterpriseInfo);
-        }
-        //更新用户表数据
+
+        // 更新用户表数据
         CompleteRequisiteUserInfoDTO userInfoDTO = ConvertUtils.sourceToTarget(fromDto, CompleteRequisiteUserInfoDTO.class);
         userInfoDTO.setDwellingPlace(enterpriseInfo.getEnterpriseAddress());
         userInfoDTO.setGrid(gridName);
-        userFeignClient.completeRequisiteInfo(userInfoDTO);
+        Result updateUserResult = userFeignClient.completeRequisiteInfo(userInfoDTO);
+        if (!updateUserResult.success()) {
+            return updateUserResult;
+        }
+
+        if (StringUtils.isBlank(fromDto.getId())) {
+            baseDao.insert(enterpriseInfo);
+        } else {
+            baseDao.updateById(enterpriseInfo);
+        }
+
         return new Result();
     }
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
index 4a42321ad..2b0d9154c 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.CompleteRequisiteUserInfoDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -23,6 +24,6 @@ public interface UserFeignClient {
      * @author qushutong
      * @date 2020/2/28 14:43
      */
-    @PostMapping("app-user/epdc-app/user/completeRequisiteInfo")
+    @PostMapping(value = "app-user/epdc-app/user/completeByEnterpriseInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result completeRequisiteInfo(@RequestBody CompleteRequisiteUserInfoDTO fromDto);
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
index a0557fc4a..f6e340dbe 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
@@ -188,7 +188,7 @@ public class EpdcAppUserController {
     /**
      * 社群添加好友列表
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:22
@@ -338,7 +338,7 @@ public class EpdcAppUserController {
     /**
      * 获取邀请记录
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:22
@@ -394,7 +394,7 @@ public class EpdcAppUserController {
      * @author qushutong
      * @date 2020/2/28 13:34
      */
-    @PostMapping("completeRequisiteInfo")
+    @PostMapping("completeByEnterpriseInfo")
     public Result completeRequisiteInfo(@RequestBody CompleteRequisiteUserInfoDTO fromDto) {
         return userService.completeRequisiteInfo(fromDto);
     }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index 7366c12f9..25634171b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1090,7 +1090,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public Result completeRequisiteInfo(CompleteRequisiteUserInfoDTO fromDto) {
         String userId = fromDto.getUserId();
-        UserEntity userEntity = baseDao.selectById(userId);
+        UserEntity userEntity = selectUserForCheck(userId, null, fromDto.getMobile());
 
         // 用于更新用户信息
         UserEntity updateUser = ConvertUtils.sourceToTarget(fromDto, UserEntity.class);