用户完善信息时，保存网格长昵称的前缀

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

@@ -439,6 +439,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class);
         UserGridRelationDTO userGridRelation = formDto.getUserGridRelation();
 
+        UserEntity oldEntity = this.baseDao.selectById(userDto.getId());
+        String nicknamePrefix = "网格长-";
+        // 姓
+        String lastName = userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE);
+
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
             PartyMembersEntity partyMembersEntity = new PartyMembersEntity();
             partyMembersEntity.setStreetId(userGridRelation.getStreetId());
@@ -455,18 +460,22 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             if (this.partyMembersDao.update(partyMembersEntity, partyUpdate) != NumConstant.ONE) {
                 throw new RenException("保存党员信息异常");
             }
+            if (oldEntity.getNickname().startsWith(nicknamePrefix)) {
+                userDto.setNickname(nicknamePrefix.concat(lastName).concat(NumConstant.ZERO_STR.equals(userDto.getSex()) ? "女士" : "先生"));
+            }
         } else {
-            UserEntity oldEntity = this.baseDao.selectById(userDto.getId());
+            if (oldEntity.getState().equals(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value())) {
+                userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value());
+            }
             String sex = oldEntity.getSex();
             userDto.setSex(sex);
+            if (!oldEntity.getNickname().startsWith(nicknamePrefix)) {
+                nicknamePrefix = userDto.getRoad().concat("-");
+            }
             if (StringUtils.isNotBlank(sex) && NumConstant.ZERO_STR.equals(sex)) {
-                userDto.setNickname(
-                        userDto.getRoad().concat("-").concat(userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE))
-                                .concat("女士"));
+                userDto.setNickname(nicknamePrefix.concat(lastName).concat("女士"));
             } else {
-                userDto.setNickname(
-                        userDto.getRoad().concat("-").concat(userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE))
-                                .concat("先生"));
+                userDto.setNickname(nicknamePrefix.concat(lastName).concat("先生"));
             }
         }