From 694dceb22d549fc112e8c96fd7f6532c7c144d3c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 13 Apr 2020 14:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BD=91=E6=A0=BCId=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E7=A8=8B=E5=BA=8F=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiWarmheartedApplyServiceImpl.java          | 2 ++
 .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java   | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
index 8bbeeeb6f6..cb1bd5de80 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
@@ -231,6 +231,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
             dto.setApp(AppClientConstant.APP_RESI);
             //角色-热心居民
             dto.setRoleKey(EpmetRoleKeyConstant.WARMHEARTED);
+            //角色表新增网格Id
+            dto.setGridId(resiWarmheartedApplyEntity.getGridId());
             result = epmetUserFeignClient.saveUserRole(dto);
         }
         return result;
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 6ca4a3ae2b..fe8b7cde2a 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
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserResiRegisterConstant;
+import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
@@ -191,6 +192,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
         userRoleDTO.setUserId(userResiInfoDTO.getUserId());
         userRoleDTO.setApp(userResiInfoDTO.getApp());
         userRoleDTO.setRoleKey(EpmetRoleKeyConstant.REGISTERED_RESI);
+        //居民角色对应的网格Id存默认值-all
+		userRoleDTO.setGridId(UserRoleConstant.DEFAULT_GRID_ID);
         userRoleService.saveUserRole(userRoleDTO);
 	}