From 5f6fa80e16bb4384488089d16afd63de4c8ff77a Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 11 Oct 2022 14:59:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/search/server/ResetSearchCenterService.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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..515dce2a 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
@@ -636,8 +636,7 @@ public class ResetSearchCenterService {
                     createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
                 }
             }
-
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(page.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
                 elasticsearchService.deleteBatchId(delList,"stand");
                 elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置国内外标准：删除-共"+delList.size()+"条数据");
@@ -795,7 +794,7 @@ public class ResetSearchCenterService {
                 }
             }
             String a = "";
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(page.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
 //                elasticsearchService.deleteBatchId(delList,"stand");
 //                elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置国内外标准：删除-共"+delList.size()+"条数据");
@@ -1196,7 +1195,7 @@ public class ResetSearchCenterService {
                 }
             }
 
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarLawsInfoEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
                 elasticsearchService.deleteBatchId(delList,"laws");
                 elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置国内外政策：删除-共"+delList.size()+"条数据");
@@ -1361,7 +1360,7 @@ public class ResetSearchCenterService {
             }
             String rett = "";
             String a = "";
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarLawsInfoEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
 //                elasticsearchService.deleteBatchId(delList,"laws");
 //                elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("国内外政策：应删除-共"+delList.size()+"条数据："+ String.join(",",delList));
@@ -1743,7 +1742,7 @@ public class ResetSearchCenterService {
                 }
             }
 
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarBussionessStandEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
                 elasticsearchService.deleteBatchId(delList,"bussstand");
                 elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置企标：删除-共"+delList.size()+"条数据");
@@ -1878,7 +1877,7 @@ public class ResetSearchCenterService {
                 }
             }
             String a = "";
-            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) && !"sync".equals(sarBussionessStandEOPage.getSyncParam()))){
+            if(!delList.isEmpty() && ("DEL".equals(searchCenter.getExecType().toUpperCase()) || "ALL".equals(searchCenter.getExecType().toUpperCase()))){
 //                elasticsearchService.deleteBatchId(delList,"bussstand");
 //                elasticsearchService.deleteBatchId(delList,"fulltextserch");
                 logger.info("重置企标：删除-共"+delList.size()+"条数据");