From 379baac9dd36f616173378a28b5501f2403a1b76 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 13 Apr 2020 13:47:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?user=5Frole=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BD=91=E6=A0=BCID=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/impl/PartyMemberConfirmServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 90973b7398..2b0ea84e5d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/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()); From 694dceb22d549fc112e8c96fd7f6532c7c144d3c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 13 Apr 2020 14:08:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E7=BD=91=E6=A0=BCId=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=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 Date: Mon, 13 Apr 2020 14:09:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E7=BD=91=E6=A0=BCId=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=B8=A6=E6=9D=A5=E7=9A=84=E7=A8=8B=E5=BA=8F=E5=8F=98?= =?UTF-8?q?=E5=8A=A8-=E6=BC=8F=E6=8F=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/UserRoleConstant.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRoleConstant.java new file mode 100644 index 0000000000..ce710319bd --- /dev/null +++ b/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"; +}