Merge remote-tracking branch 'origin/dev_ic_data' into develop

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1588,11 +1588,12 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         }
         // 分类编码长度
         Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId());
-        PageInfo<ResiBuzzDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length));
+        List<ResiBuzzDTO> allList = baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(), length);
-        List<ResiBuzzDTO> list = pageInfo.getList();
+        if (CollectionUtils.isEmpty(allList)){
-        if (CollectionUtils.isEmpty(list)){
             return new ResiBuzzResultDTO();
         }
+        List<ResiBuzzDTO> list = allList.stream().skip(formDTO.getPageSize() * (formDTO.getPageNo() - NumConstant.ONE))
+                .limit(formDTO.getPageSize()).collect(Collectors.toList());
         AtomicReference<Integer> no = new AtomicReference<>((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize() + NumConstant.ONE);
         ResiBuzzResultDTO result = new ResiBuzzResultDTO();
         UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
@@ -1602,8 +1603,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             throw new EpmetException("查询人员姓名失败...");
         }
         // 默认最多50 产品要求
-        Integer total = pageInfo.getSize();
+        result.setTotal(allList.size());
-        result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total);
         // 赋值展示名字
         list.forEach(l -> {
             l.setSort(no.getAndSet(no.get() + NumConstant.ONE));

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -622,7 +622,7 @@
             <if test='orgType == "agency" '>
                 AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId})
             </if>
-        ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC
+        ORDER BY (s.SUPPORT_COUNT + s.OPPOSITION_COUNT) DESC,i.created_time DESC LIMIT 50
     </select>
 
     <!-- 查询客户下1级分类的长度 -->