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/ZfEquipmentServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index fbdc87b..415b1e5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -356,6 +356,7 @@
esModel.setBy4(zfEquipment.getLocation());
esModel.setBy5("/family/zfEquipment");
esModel.setRemark(zfEquipment.getRemark());
+ esModel.setFid(familyId);
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esService.insertTable(esModel);
@@ -485,6 +486,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璁惧");
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
if(zfEquipment.getName()!=null){
@@ -564,11 +569,13 @@
//鍒犻櫎es涓殑鏁版嵁
zfEquipments.stream().forEach(zfEquipment -> {
EsModel esModel = esService.findByCtId(zfEquipment.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