2 Commits 743550fc76 ... ad35097820

Tác giả SHA1 Thông báo Ngày
  zhangjq ad35097820 Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA 1 năm trước cách đây
  zhangjq afea08f2a6 我收到的周日报修复 1 năm trước cách đây

+ 1 - 1
zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/report/ReportServiceImpl.java

@@ -204,7 +204,7 @@ public class ReportServiceImpl implements ReportService {
         if (CollectionUtil.isEmpty(userReportReceiveList)) {
             return new PageResult<>();
         }
-        List<Long> reportIdList = userReportReceiveList.stream().filter(c -> c.getReportId() != null).map(ReportReceiveRespVO::getReportId).distinct().collect(Collectors.toList());
+        List<Long> reportIdList = userReportReceiveList.stream().filter(c -> c.getReportId() != null).limit(2000).map(ReportReceiveRespVO::getReportId).distinct().collect(Collectors.toList());
 
         //获取报告分页列表
         LambdaQueryWrapper<ReportDO> queryWrapper = new LambdaQueryWrapper<>();

+ 1 - 1
zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/reportreceive/ReportReceiveServiceImpl.java

@@ -130,7 +130,7 @@ public class ReportReceiveServiceImpl implements ReportReceiveService {
             return Collections.emptyList();
         }
         return ReportReceiveConvert.INSTANCE.convertList(reportReceiveMapper.selectList(new LambdaQueryWrapperX<ReportReceiveDO>()
-                        .eq(ReportReceiveDO::getDeleted,0)
+                        .eq(ReportReceiveDO::getDeleted,0).orderByDesc(ReportReceiveDO::getUpdateTime)
                 .eqIfPresent(ReportReceiveDO::getReceiveUserId, userId)));
     }