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<UserDao, UserEntity> 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<UserDao, UserEntity> 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<UserDao, UserEntity> 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<UserDao, UserEntity> 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());