From a979d3b0f9bb814ffeb014fd210e4dff99462e81 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 26 四月 2024 11:31:04 +0800
Subject: [PATCH] 修改代码
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index 56f0846..98968fd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -302,6 +302,11 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -470,6 +475,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "鏀惰棌鍜岃崳瑾�");
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
if(zfCollection.getType()!=null){
@@ -555,11 +564,15 @@
//鍒犻櫎es涓殑鏁版嵁
zfCollections.stream().forEach(zfCollection -> {
EsModel esModel = esService.findByCtId(zfCollection.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