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/ZfContactServiceImpl.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index a1a34fc..aff7172 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -489,6 +489,10 @@
             //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
             EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "閫氳褰�");
 
+            if (esResult == null){
+                return AjaxResult.success();
+            }
+
             //鎿嶄綔es淇敼鏁版嵁
             EsModel newModel = new EsModel();
             if(zfContact.getMyName()!=null){
@@ -567,12 +571,17 @@
             //鍒犻櫎es涓殑鏁版嵁
             zfContacts.stream().forEach(zfContact -> {
                 EsModel esModel = esService.findByCtId(zfContact.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();
         }else {

--
Gitblit v1.9.1