diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 03be8495..ad8f15a7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -59,7 +59,7 @@ public class SarStandardComplianceAssessResultController { if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE"); + queryWrapper.select("distinct STAND_ID,STAND_NUMBER, STAND_NAME, STAND_TYPE"); if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) { queryWrapper.like("STAND_NAME", eo.getStandName().trim()); } @@ -70,8 +70,15 @@ public class SarStandardComplianceAssessResultController { queryWrapper.like("type", eo.getType().trim()); } IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); + List ids=new ArrayList<>(); + page.getRecords().forEach(productAssess -> {ids.add(productAssess.getStandId());}); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + IPage iPage1 = new Page<>(eo.getCurrent(), eo.getSize()); + queryWrapper1.select(" STAND_ID,STAND_NUMBER, STAND_NAME, STAND_TYPE"); + queryWrapper1.in("STAND_ID",ids); + IPage page2 = iSarStandardComplianceProductAssessService.page(iPage1, queryWrapper1); - while (page.getRecords().remove(null)) ; + while (page2.getRecords().remove(null)) ; return Result.success(page); } else {