From 4d781da2b491178efa362dc1f7017c01ef63370e Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Thu, 5 Nov 2020 14:58:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=BB=BA=E7=BB=84?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=9C=89=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/group/service/impl/ResiGroupServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index d24ad2e1c4..14e71c03bc 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -640,7 +640,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setGridId(resiGroupDTO.getGridId());
 		wxSubscribeMessageFormDTO.setBehaviorType(UserMessageConstant.WX_APPLY_CREATE_GROUP_BEHAVIOR);
-		wxSubscribeMessageFormDTO.setMessageContent(String.format(UserMessageConstant.AGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName()));
+		wxSubscribeMessageFormDTO.setMessageContent(String.format(UserMessageConstant.DISAGREE_CREATING_GROUP_MSG_TEMPLATE,resiGroupDTO.getGroupName(),disAgreeApplyGroupFormDTO.getRejectReason()));
 		wxSubscribeMessageFormDTO.setMessageTime(new Date());
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();
 		msgList.add(wxSubscribeMessageFormDTO);

From fc9e260913a409185303b422e3774f51152fe37f Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Thu, 5 Nov 2020 15:49:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?userid=E6=94=B9staffid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/WxmpMessageServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
index 1a8a7c3fbc..f7ba9f59be 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
@@ -241,7 +241,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                     jsonObject.put(WxmpMessageConstant.PAGE, resiPage.toString());
                 } else if (WxmpMessageConstant.GOV_DB.equals(clientType)) {
                     StringBuilder govPage = new StringBuilder(WxmpMessageConstant.PAGE_URL);
-                    govPage.append("?customerId=").append(customerId).append("&userId=").append(userId);
+                    govPage.append("?customerId=").append(customerId).append("&staffId=").append(userId);
                     jsonObject.put(WxmpMessageConstant.PAGE, govPage.toString());
                 }
                 //开发环境