Merge remote-tracking branch 'origin/dev'

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2500,14 +2500,19 @@ 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)){
+        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)){
+            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){
             // 存在未读消息