From e51b4bef973e3885a91baf42fb2e51dba9d2ee3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 8 Jan 2020 15:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B9=8B=E5=90=8E=E6=89=AB=E7=AC=AC=E4=BA=8C=E4=B8=AA?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E6=98=B5=E7=A7=B0=E8=A2=AB=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/EpdcAppUserController.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 cfacb52b1..2550651a4 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
@@ -14,6 +14,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
+import com.elink.esua.epdc.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.service.UserInvitationRecordService;
 import com.elink.esua.epdc.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -233,9 +234,15 @@ public class EpdcAppUserController {
      */
     @PostMapping("updateWxInfo")
     public Result updateWxInfo(@RequestBody UserDTO userDto) {
+
         UserDTO user = new UserDTO();
+        // 查询此用户是否已经注册并且完善了用户信息
+        UserDTO userDTO = userService.get(userDto.getId());
+        // 除了注册之外的 几个状态都不需要更新Nickname
+        if(AppUserStatesEnum.STATE_REGISTERED.value().equals(userDTO.getState())){
+            user.setNickname(userDto.getNickname());
+        }
         user.setId(userDto.getId());
-        user.setNickname(userDto.getNickname());
         user.setFaceImg(userDto.getFaceImg());
         user.setSex(userDto.getSex());
         user.setWxUnionId(userDto.getWxUnionId());