Commit a1c7aea801796dd495b28c3095430c52b7f14d23

Authored by 张志伟
2 parents bcb8ac08 1494dc95

Merge branch 'main-fix' into 'main'

feature(bug):  筛选集团

筛选集团

See merge request !67
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorReportService.java
@@ -103,6 +103,7 @@ public class EvalIndicatorReportService { @@ -103,6 +103,7 @@ public class EvalIndicatorReportService {
103 .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getCreateTime, startTime) 103 .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getCreateTime, startTime)
104 .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getCreateTime, endTime) 104 .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getCreateTime, endTime)
105 .eq(EvalIndicatorImportRecord::getYn, Boolean.TRUE) 105 .eq(EvalIndicatorImportRecord::getYn, Boolean.TRUE)
  106 + .eq(EvalIndicatorImportRecord::getGroupId, dto.getGroupId())
106 .orderByDesc(EvalIndicatorImportRecord::getCreateTime) 107 .orderByDesc(EvalIndicatorImportRecord::getCreateTime)
107 ); 108 );
108 return PublicUtil.toPage(pageData, importRecord -> { 109 return PublicUtil.toPage(pageData, importRecord -> {