This commit is contained in:
yuezhihang
2022-01-14 10:59:40 +08:00
parent bfa6f94452
commit 509905195a
@@ -70,15 +70,8 @@ public class SarStandardComplianceAssessResultController {
queryWrapper.like("type", eo.getType().trim());
}
IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
List<String> ids=new ArrayList<>();
page.getRecords().forEach(productAssess -> {ids.add(productAssess.getStandId());});
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper1 = new QueryWrapper<>();
IPage<SarStandardComplianceProductAssess> iPage1 = new Page<>(eo.getCurrent(), eo.getSize());
queryWrapper1.select(" STAND_ID,STAND_NUMBER, STAND_NAME, STAND_TYPE");
queryWrapper1.in("STAND_ID",ids);
IPage<SarStandardComplianceProductAssess> page2 = iSarStandardComplianceProductAssessService.page(iPage1, queryWrapper1);
while (page2.getRecords().remove(null)) ;
while (page.getRecords().remove(null)) ;
return Result.success(page);
} else {