From 948eb789f55492aa57df03319fc737e4a2ff909f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 1 Jun 2021 16:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=86=85=E8=BF=91=E5=8D=81=E6=9D=A1?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 3e11e5677f..b0602ceda3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -2500,13 +2500,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         result.setUserRole(leaderFlag);
         ResiGroupEntity resiGroup = resiGroupDao.selectById(groupId);
         result.setGroupType(resiGroup.getGroupType());
-        if (leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)){
-            // 当前人员是组长,显示通知按钮
-            result.setNoticeBut(true);
-        }
-        if (result.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH) && leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)){
-            // 当前组为支部组且当前人是组长,显示活动按钮
-            result.setActBut(true);
+        if (StringUtils.isEmpty(leaderFlag)){
+            result.setNoticeBut(false);
+            result.setActBut(false);
+        }else {
+            if (leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)) {
+                // 当前人员是组长,显示通知按钮
+                result.setNoticeBut(true);
+            }
+            if (result.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH) && leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)) {
+                // 当前组为支部组且当前人是组长,显示活动按钮
+                result.setActBut(true);
+            }
         }
         Integer unRead = resiGroupDao.selectUserUnRead(groupId, userId);
         if (unRead > NumConstant.ZERO){