群

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

@@ -730,11 +730,11 @@ public class GroupChatServiceImpl implements GroupChatService {
         String departmentId = qdto.getDepartmentId();
         if (StringUtils.isNotBlank(departmentId)) {
             TabHaobanDepartment department = this.departmentService.selectById(departmentId);
+            departmentIdList.add(departmentId);
             if (department != null) {
                 String parentDepartmentId = department.getParentDepartmentId();
                 if (!"0".equals(parentDepartmentId)) {
                     String chainId = department.getChainId() + Constant.ID_SEPARATOR + departmentId;
-                    departmentIdList.add(departmentId);
                     List<TabHaobanDepartment> tabList = departmentService.listByChainId(chainId,
                             qdto.getWxEnterpriseId());
                     List<String> departmentIds = tabList.stream().map(TabHaobanDepartment::getDepartmentId)
@@ -742,6 +742,7 @@ public class GroupChatServiceImpl implements GroupChatService {
                     departmentIdList.addAll(departmentIds);
                 }
             }
+            qdto.setDepartmentIdList(departmentIdList);
         }
         PageHelper.startPage(basePageInfo);
         List<GroupChatOwnerDTO> list = this.groupChatOwnerMapper.listOwner(qdto);