From 43c910add8ea46a05a5b6ee104038203ae365df2 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 24 十月 2023 20:40:25 +0800
Subject: [PATCH] 129836

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index a09327c..9257e9c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -391,6 +391,7 @@
             esModel.setBy4(zfClean.getSuitable());
             esModel.setBy5("/family/zfClean");
             esModel.setRemark(zfClean.getRemark());
+            esModel.setFid(familyId);
             //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
             esService.insertTable(esModel);
             
@@ -493,6 +494,10 @@
             //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
             EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "淇濇磥涓庢敹绾�");
 
+            if (esResult == null){
+                return AjaxResult.success();
+            }
+
             //鎿嶄綔es淇敼鏁版嵁
             EsModel newModel = new EsModel();
             if(zfClean.getType()!=null){
@@ -572,11 +577,14 @@
             //鍒犻櫎es涓殑鏁版嵁
             zfCleans.stream().forEach(zfClean -> {
                 EsModel esModel = esService.findByCtId(zfClean.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