Merge branch 'main' into test

姜超
2 parents 581e1dda a1c7aea8
Showing 1 changed file with 1 additions and 0 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/eval/EvalIndicatorReportService.java
@@ -103,6 +103,7 @@ public class EvalIndicatorReportService {
                         .ge(PublicUtil.isNotEmpty(startTime), EvalIndicatorImportRecord::getCreateTime, startTime)
                         .le(PublicUtil.isNotEmpty(endTime), EvalIndicatorImportRecord::getCreateTime, endTime)
                         .eq(EvalIndicatorImportRecord::getYn, Boolean.TRUE)
+                        .eq(EvalIndicatorImportRecord::getGroupId, dto.getGroupId())
                         .orderByDesc(EvalIndicatorImportRecord::getCreateTime)
         );
         return PublicUtil.toPage(pageData, importRecord -> {