From 340b7b84a6cf36f0fb0793589a6bebe834763927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 3 Jan 2020 14:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC=E9=95=BF?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=8A=A5=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=B7=B2?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/AppUserServiceImpl.java    | 11 ++++++-----
 .../elink/esua/epdc/service/impl/UserServiceImpl.java |  8 ++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index c462a0d73..d4be194be 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -265,11 +265,12 @@ public class AppUserServiceImpl implements AppUserService {
         // 校验手机号是否已被注册为小程序用户
         EpdcUserRegistFormDTO verifyAppUser = new EpdcUserRegistFormDTO();
         verifyAppUser.setMobile(mobile);
-        // 在获取信息时就进行校验，不消耗wxCode，用户可以重复提交
-        Result verifyUserRegisterData = userFeignClient.verifyUserRegisterData(verifyAppUser);
-        if (!verifyUserRegisterData.success()) {
-            return new Result().error(verifyUserRegisterData.getMsg());
-        }
+        //修改bug：已注册用户不能注册网格长  去调查重
+//        // 在获取信息时就进行校验，不消耗wxCode，用户可以重复提交
+//        Result verifyUserRegisterData = userFeignClient.verifyUserRegisterData(verifyAppUser);
+//        if (!verifyUserRegisterData.success()) {
+//            return new Result().error(verifyUserRegisterData.getMsg());
+//        }
         // 校验手机验证码
         this.checkSmsCode(mobile, formDto.getSmsCode());
 
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 976d3ca0b..ea183d266 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
@@ -323,8 +323,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(UserFieldConsant.WX_OPEN_ID, gridLeader.getWxOpenId());
-        UserEntity existUser = this.baseDao.selectOne(wrapper);
-
+//        UserEntity existUser = this.baseDao.selectOne(wrapper);
+        UserDTO existUser = selectUserByWxInfo(gridLeader.getWxOpenId(), gridLeader.getWxUnionId());
         String userId;
         String faceImg = userEntity.getFaceImg();
 
@@ -346,6 +346,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             // 不更新头像信息
             userEntity.setFaceImg(null);
             userEntity.setId(userId);
+            //用户已绑定手机号时不更新手机号
+            if(StringUtils.isNotBlank(existUser.getMobile())){
+                userEntity.setMobile(existUser.getMobile());
+            }
             this.updateById(userEntity);
 
             for (UserGridRelationDTO userGridRelation : userGridList) {