From 65f116401d6f1f67726ffb482049341cd57f550e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 31 Dec 2019 15:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=94=A8=E6=88=B7=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E9=83=BD=E6=9F=A5=E9=87=8D=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=20=E5=88=A4=E6=96=AD=E6=98=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=9B=B4=E6=8E=A5=E6=8A=8A=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E7=BD=AE=E4=B8=BAnull=20=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E5=89=8D=E7=AB=AF=E7=94=A8=E6=88=B7=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=AF=AF=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/service/impl/AppUserServiceImpl.java    | 2 ++
 .../com/elink/esua/epdc/service/impl/UserServiceImpl.java   | 6 +++---
 2 files changed, 5 insertions(+), 3 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 3e40ff3f7..c462a0d73 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
@@ -798,6 +798,8 @@ public class AppUserServiceImpl implements AppUserService {
                     return new Result().error(verification);
                 }
             }
+        }else {
+            userDto.setIdentityNo(null);
         }
         // 验证手机号
         this.checkSmsCode(userDto.getMobile(), infoDto.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 b7a9dd08f..72f9d82f3 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
@@ -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());
     }