From 40175837521672fe661c9916bde4a276a69998ee Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Sat, 8 Oct 2022 09:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/server/ResetSearchCenterService.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
index 6913cfc7..a32cc723 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
@@ -557,7 +557,7 @@ public class ResetSearchCenterService {
         List<Map<String, Object>> searchListData = elasticsearchService.searchAll("stand",search);
 
         List<String> esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
-
+        logger.info("esIdList 的id集合" + esIdList);
         page.setValidFlag("0");
         if(searchCenter.getIdList() != null && !searchCenter.getIdList().isEmpty()){
             String[] result = searchCenter.getIdList().toArray(new String[0]);
@@ -570,6 +570,7 @@ public class ResetSearchCenterService {
             page.setPageSize(count);
             page.setMenuId("nomenu");
             page.setStandType("ALL");
+            logger.info("国内外标准查询：" + page.toString());
             List<SarStandardsInfo> rowsStand = iSarStandardsInfoService.getSarStandardsInfoPage(page);
             List<SarStandardsInfo> insList = new ArrayList<>();
             List<SarStandardsInfo> updList = new ArrayList<>();
@@ -859,7 +860,12 @@ public class ResetSearchCenterService {
                         getAttrMap.put(clobField, fieldValue);
                     }
                 }
-                getAttrMap.put("updateAuth","1");
+                logger.info("getAttrMap 查询1前: " + getAttrMap);
+                if (null == getAttrMap){
+                    logger.info("国内外标准详情表查询出了null");
+                }else {
+                    getAttrMap.put("updateAuth", "1");
+                }
                 row.setAttrInfoMap(getAttrMap);
             }
 
@@ -1653,7 +1659,7 @@ public class ResetSearchCenterService {
         List<Map<String, Object>> searchListData = elasticsearchService.searchAll("bussstand",search);
 
         List<String> esIdList = searchListData.stream().map(stringObjectMap -> stringObjectMap.get("id").toString()).collect(Collectors.toList());
-
+        logger.info("企标查询ids" + esIdList);
         sarBussionessStandEOPage.setValidFlag("0");
         sarBussionessStandEOPage.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id");
         sarBussionessStandEOPage.setMenuRoleList(null);
@@ -1669,11 +1675,12 @@ public class ResetSearchCenterService {
         QueryWrapper qw3 = new QueryWrapper();
         qw3.eq("VALID_FLAG","0");
         int count3 = iSarBussionessStandService.count(qw3);
-
+        logger.info("企标查询数量" + count3);
         if(count3 > 0){
             sarBussionessStandEOPage.setPageSize(count3);
 
             List<SarBussionessStand> rowsStand = iSarBussionessStandService.getSarBussionStandPage(sarBussionessStandEOPage);
+            logger.info("企标查询结果" + count3);
             List<SarBussionessStand> insList = new ArrayList<>();
             List<SarBussionessStand> updList = new ArrayList<>();
             List<String> delList = new ArrayList<>();