From 6a3a60993f571c7834d4d238c12fa963126f76d9 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期日, 19 十一月 2023 18:39:29 +0800
Subject: [PATCH] 修改null的bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 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 ddfe5d6..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
@@ -375,6 +375,7 @@
esModel.setBy4(zfContact.getWork());
esModel.setBy5("/family/zfContact");
esModel.setRemark(zfContact.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
return AjaxResult.success();
@@ -488,6 +489,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "閫氳褰�");
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
if(zfContact.getMyName()!=null){
@@ -566,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