Merge remote-tracking branch 'origin/dev_1118' into dev_1118

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -798,6 +798,8 @@ public class AppUserServiceImpl implements AppUserService {
                     return new Result().error(verification);
                 }
             }
+        }else {
+            userDto.setIdentityNo(null);
         }
         // 验证手机号
         this.checkSmsCode(userDto.getMobile(), infoDto.getSmsCode());

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -480,8 +480,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if (selectCount > NumConstant.ZERO) {
             return new Result().error("手机号已被注册");
         }
-            //修改为用户 党员都需要查重
-//        if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
+            //党员都需要查重
+        if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
             userWrapper = new QueryWrapper<>();
             userWrapper.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo())
                     .ne(FieldConstant.ID, userId);
@@ -489,7 +489,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             if (selectCount > NumConstant.ZERO) {
                 return new Result().error("身份证号已被注册");
             }
-//        }
+        }
 
         return new Result<String>().ok(userEntity.getState());
     }