From 47c03dc42269a57ae6e26a1ecf5419a24414ee5c Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Mon, 18 Nov 2019 16:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E5=96=84=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/UserServiceImpl.java    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

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 7f162bd5f..802ae0b54 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
@@ -440,6 +440,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         UserEntity oldEntity = this.baseDao.selectById(userDto.getId());
 
+        // 身份证号
+        String identityNo = userDto.getIdentityNo();
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
             PartyMembersEntity partyMembersEntity = new PartyMembersEntity();
             partyMembersEntity.setStreetId(userGridRelation.getStreetId());
@@ -451,7 +453,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value());
 
             QueryWrapper<PartyMembersEntity> partyWrapper = new QueryWrapper<>();
-            partyWrapper.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo())
+            partyWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo)
                     .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
             int selectCount = this.partyMembersDao.selectCount(partyWrapper);
 
@@ -460,12 +462,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 PartyAuthenticationFailedEntity authenticationFailedEntity = ConvertUtils.sourceToTarget(partyMembersEntity, PartyAuthenticationFailedEntity.class);
                 authenticationFailedEntity.setState(Integer.parseInt(YesOrNoEnum.NO.value()));
                 authenticationFailedEntity.setAddress(userDto.getAddress());
+                authenticationFailedEntity.setRealName(userDto.getRealName());
+                authenticationFailedEntity.setMobile(userDto.getMobile());
+                authenticationFailedEntity.setIdentityNo(identityNo);
+                authenticationFailedEntity.setRegistTime(oldEntity.getRegisterTime());
                 partyAuthenticationFailedDao.insert(authenticationFailedEntity);
 
                 userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
-            }else {
+            } else {
                 UpdateWrapper<PartyMembersEntity> partyUpdate = new UpdateWrapper<>();
-                partyUpdate.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo())
+                partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo)
                         .eq(UserFieldConsant.REAL_NAME, userDto.getRealName());
 
                 this.partyMembersDao.update(partyMembersEntity, partyUpdate);
@@ -476,16 +482,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
             }
         }
-
+        // 昵称前缀
         String nicknamePrefix = "网格长-";
+        if (!oldEntity.getNickname().startsWith(nicknamePrefix)) {
+            nicknamePrefix = userDto.getRoad().concat("-");
+        }
         // 姓
         String lastName = userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE);
-        if (oldEntity.getNickname().startsWith(nicknamePrefix)) {
-            userDto.setNickname(nicknamePrefix.concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生"));
-        }else {
-            userDto.setNickname(
-                    userDto.getRoad().concat("-").concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生"));
-        }
+
+        userDto.setNickname(nicknamePrefix.concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生"));
 
         UserEntity userEntity = ConvertUtils.sourceToTarget(userDto, UserEntity.class);
         boolean updateUser = this.updateById(userEntity);
@@ -498,12 +503,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     /**
      * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+     *
      * @param userId 用户Id
      * @return
      */
     @Override
     public Result<EpdcResidentDetailResultDto> residentDetail(String userId) {
-        if(StringUtils.isBlank(userId)){
+        if (StringUtils.isBlank(userId)) {
             return new Result<EpdcResidentDetailResultDto>().error("用户Id不能为空");
         }
         EpdcResidentDetailResultDto dto = this.baseDao.residentDetailByUserId(userId);