非空判断

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatApiServiceImpl.java

@@ -96,11 +96,13 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
             if (needClerkReltaion) {
                 List<String> staffIdList = dtoList.stream().filter(dto -> StringUtils.isNotBlank(dto.getStaffId()))
                         .map(dto -> dto.getStaffId()).collect(Collectors.toList());
-                List<String> relationIdList = this.staffClerkRelationService
-                        .listRelationsStaffId(new HashSet<>(staffIdList));
-                dtoList.forEach(one -> {
-                    one.setClerkRelationFlag(relationIdList.contains(one.getStaffId()) ? 1 : 0);
-                });
+                if(CollectionUtils.isNotEmpty(staffIdList)) {
+                    List<String> relationIdList = this.staffClerkRelationService
+                            .listRelationsStaffId(new HashSet<>(staffIdList));
+                    dtoList.forEach(one -> {
+                        one.setClerkRelationFlag(relationIdList.contains(one.getStaffId()) ? 1 : 0);
+                    });
+                }
             }
             // 原群主
             if (qdto.getStatus() == 2) {

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -255,7 +255,7 @@
         <foreach collection="staffIdList" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
-        and a.status_flag = 1 and b.status_flag = 1 group by a.staff_id;
+        and a.status_flag = 1 and b.status_flag = 1 group by a.staff_id
     </select>
 
     <select id="listMemberStaffRelNew" resultType="com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO">

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

@@ -176,6 +176,7 @@ public class GroupChatHmController {
             String chats = this.getGroupChatName(wxEnterpriseId, delIdList) ;
             if(StringUtils.isNotBlank(chats)) {
                o =  "删除可加入群聊【" + chats + "】";
+               content.append(o);
             }
         }
         String p = null ;
@@ -186,6 +187,7 @@ public class GroupChatHmController {
             String chats = this.getGroupChatName(wxEnterpriseId, newIdList) ;
             if(StringUtils.isNotBlank(chats)) {
                p =  "新增可加入群聊【" + chats + "】";
+               content.append(p);
             }
         }