From 28c0335527bcb82ea646b62fb0cdcbb6bfa3768e Mon Sep 17 00:00:00 2001 From: yujintao Date: Fri, 1 Nov 2019 09:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=8C=E5=96=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=97=B6=EF=BC=8C=E4=BF=9D=E5=AD=98=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=95=BF=E6=98=B5=E7=A7=B0=E7=9A=84=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/UserServiceImpl.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 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 4f45e6642..6ad6824c9 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 @@ -439,6 +439,11 @@ public class UserServiceImpl extends BaseServiceImpl 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 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("先生")); } }