From bfa6f944529dbb3e3207b36ad636de09fd5d8f04 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 14 Jan 2022 10:44:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandardComplianceAssessResultController.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
             IPage<SarStandardComplianceProductAssess> 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<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 (page.getRecords().remove(null)) ;
+            while (page2.getRecords().remove(null)) ;
 
             return Result.success(page);
         } else {