From 2c1af5070f623e9898d076ead96cecdf080f183c Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Fri, 5 Jun 2020 18:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AB=AF=20-=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E5=AE=8C=E5=96=84=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E3=80=91-=E3=80=90=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E5=85=9A=E5=91=98=E8=BA=AB=E4=BB=BD=E8=AF=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/06/05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/UserServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 80618b7f9..e8113672b 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
@@ -67,6 +67,7 @@ import com.elink.esua.epdc.service.*;
 import com.elink.esua.epdc.util.AppUserUtils;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
+import org.jsoup.helper.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -819,7 +820,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         userEntity.setWxOpenId(StringUtils.isBlank(userEntity.getWxOpenId()) ? null : userEntity.getWxOpenId());
         userEntity.setWxUnionId(StringUtils.isBlank(userEntity.getWxUnionId()) ? null : userEntity.getWxUnionId());
         userEntity.setFaceImg(StringUtils.isBlank(userEntity.getFaceImg()) ? null : userEntity.getFaceImg());
-        if (YesOrNoEnum.NO.value().equals(userEntity.getPartyFlag())) {//居民进行身份证赋值
+        if (StringUtil.isBlank(completeAppUser.getIdentityNo())) {//居民进行身份证赋值
+
             userEntity.setIdentityNo(findUser.getIdentityNo());
         }
         // 只进行认证居民操作