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 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()); } // 只进行认证居民操作