From f0aed8ef4c91c3bcaeb098b132ace91395f2193a Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 21 Jan 2021 15:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=94=A8=E6=88=B7=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/redis/UserBaseInfoRedis.java      | 2 +-
 .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
index ec6d1eb485..98c23d744a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@@ -210,7 +210,7 @@ public class UserBaseInfoRedis {
             //此时orientCache中包概括要更新的属性以及之前有切不更新的属性
             currentCache = orientCache;
         }
-        RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId());
+            RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(entity.getUserId());
         //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士)
         if(null != relation && StringUtils.isNotBlank(relation.getGridId())){
             currentCache.setCustomerId(relation.getCustomerId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 9c973e7b78..e5e7678835 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -271,10 +271,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 
 		//判断手机号是否可用
 		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
-			//数据存入居民注册表
-			saveUserResiInfo(userResiInfoDTO);
 			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
 			registerRelationService.saveRegisterRelation(userResiInfoDTO);
+			//数据存入居民注册表
+			saveUserResiInfo(userResiInfoDTO);
 		/*	//将用户于居民角色关联  saveUserResiInfo已包含
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setUserId(userResiInfoDTO.getUserId());