test

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

@@ -210,7 +210,6 @@ public class GroupChatServiceImpl implements GroupChatService {
 
     @Override
     public Page<GroupChatBO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
-        PageHelper.startPage(basePageInfo);
         if (null != qdto.getChatHmId()) {
             List<TabGroupChatHmRelation> list = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
             if (CollectionUtils.isEmpty(list)) {
@@ -220,6 +219,7 @@ public class GroupChatServiceImpl implements GroupChatService {
             List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId()).collect(Collectors.toList());
             qdto.setGroupChatIdList(groupChatIdList);
         }
+        PageHelper.startPage(basePageInfo);
         List<TabGroupChat> list = this.groupChatMapper.list(qdto);
         Page<GroupChatBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatBO.class);
         return retPage;

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

@@ -70,11 +70,13 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
         } else if ("quitMemberCount".equals(sortColumn)) {
             sortColumn = "quit_member_count";
         }
+        qdto.setSortColumn(sortColumn);
         Page<GroupChatBO> page = this.groupChatService.listPage(qdto, basePageInfo);
         Page<GroupChatDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatDTO.class);
         List<GroupChatDTO> dtoList = resultPage.getResult();
         // 处理关联状态
-        if (CollectionUtils.isNotEmpty(dtoList) && qdto.getStatus() == 1) {
+        boolean needClerkReltaion = (qdto.getStatus() == 1);
+        if (CollectionUtils.isNotEmpty(dtoList) && needClerkReltaion) {
             List<String> staffIdList = dtoList.stream().filter(dto -> StringUtils.isNotBlank(dto.getStaffId()))
                     .map(dto -> dto.getStaffId()).collect(Collectors.toList());
             List<String> relationIdList = this.staffClerkRelationService

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

@@ -97,6 +97,7 @@ public class GroupChatHmController {
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         GroupChatSearchQDTO qdto = new GroupChatSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
         qdto.setChatHmId(chatHmId);
         ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
         return RestResponse.successResult(page.getResult());