From 9a5bfe21d247dbd45baedccc28f687a943c647ce Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 25 九月 2023 22:05:17 +0800
Subject: [PATCH] 734627
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 69f651e..6aa66ba 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -460,6 +460,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处");
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
if(zfEconomy.getUseFor()!=null){
@@ -522,11 +526,15 @@
//鍒犻櫎es涓殑鏁版嵁
zfEconomys.stream().forEach(zfEconomy -> {
EsModel esModel = esService.findByCtId(zfEconomy.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处");
- DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
- try {
- restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
+
+ if (esModel != null){
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ try {
+ restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
}
});
return AjaxResult.success();
--
Gitblit v1.9.1