Merge remote-tracking branch 'origin/dev0.2' into dev0.2

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -189,6 +189,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
 			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
+			userRole.setGridId("all");
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			userRole.setApp(partyMemberInfoDTO.getApp());

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;

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java

@@ -0,0 +1,14 @@
+package com.epmet.constant;
+
+/**
+ * @Description
+ * @IntefaceName UserRoleConstant
+ * @Author sun
+ */
+public interface UserRoleConstant {
+
+	/**
+	 * 角色表对应的是居民角色时grid_id的默认值
+	 */
+	String DEFAULT_GRID_ID = "all";
+}

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);
 	}