From 27d2e7fead0e7c3a61df1ccbec067fcc895e8a5e Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 4 Dec 2019 17:12:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AE=A4=E8=AF=81=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=A4=B1=E8=B4=A5=E6=97=B6=E4=BF=9D=E5=AD=98=E7=94=A8?= =?UTF-8?q?=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/UserServiceImpl.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 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 c1d77ed12..d7746b855 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 @@ -403,10 +403,10 @@ public class UserServiceImpl extends BaseServiceImpl implem } userGridRel.setUserId(formUserDto.getId()); //修改数据库结构 - userGridRel.setAllDeptNames(formUserDto.getStreet()+"-"+formUserDto.getCommunity()+"-"+formUserDto.getGrid()); - userGridRel.setAllDeptIds(formUserDto.getStreetId()+","+formUserDto.getCommunityId()+","+formUserDto.getGridId()); - userGridRel.setParentDeptNames(formUserDto.getStreet()+"-"+formUserDto.getCommunity()); - userGridRel.setParentDeptIds(formUserDto.getStreetId()+","+formUserDto.getCommunityId()); + userGridRel.setAllDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity() + "-" + formUserDto.getGrid()); + userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId()); + userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); + userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); // 用户绑定网格 userGridRelationService.save(userGridRel); // 组装用户注册信息 @@ -475,17 +475,18 @@ 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 userId = userDto.getId(); + UserEntity oldEntity = this.baseDao.selectById(userId); // 身份证号 String identityNo = userDto.getIdentityNo(); if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); //修改数据库结构 - partyMembersEntity.setAllDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity()+"-"+userGridRelation.getGrid()); - partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId()+","+userGridRelation.getGridId()); - partyMembersEntity.setParentDeptNames(userGridRelation.getStreet()+"-"+userGridRelation.getCommunity()); - partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId()+","+userGridRelation.getCommunityId()); + partyMembersEntity.setAllDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity() + "-" + userGridRelation.getGrid()); + partyMembersEntity.setAllDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId() + "," + userGridRelation.getGridId()); + partyMembersEntity.setParentDeptNames(userGridRelation.getStreet() + "-" + userGridRelation.getCommunity()); + partyMembersEntity.setParentDeptIds(userGridRelation.getStreetId() + "," + userGridRelation.getCommunityId()); partyMembersEntity.setGridId(userGridRelation.getGridId()); partyMembersEntity.setGridName(userGridRelation.getGrid()); @@ -500,6 +501,7 @@ public class UserServiceImpl extends BaseServiceImpl implem if (selectCount == NumConstant.ZERO) { // 党员库中没有，存进党员认证失败表 PartyAuthenticationFailedEntity authenticationFailedEntity = ConvertUtils.sourceToTarget(partyMembersEntity, PartyAuthenticationFailedEntity.class); + authenticationFailedEntity.setUserId(userId); authenticationFailedEntity.setState(Integer.parseInt(YesOrNoEnum.NO.value())); authenticationFailedEntity.setAddress(userDto.getAddress()); authenticationFailedEntity.setRealName(userDto.getRealName()); @@ -519,7 +521,7 @@ public class UserServiceImpl extends BaseServiceImpl implem userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value()); } //插入用户认证历史表 - userAuthenticateHistoryEntity.setUserId(userDto.getId()); + userAuthenticateHistoryEntity.setUserId(userId); userAuthenticateHistoryEntity.setMobile(userDto.getMobile()); userAuthenticateHistoryEntity.setRealName(userDto.getRealName()); userAuthenticateHistoryEntity.setAddress(userDto.getAddress());