修改网格长注册报手机号已注册

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());
 

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) {