From 98049e92b44f3d2e89364b58d520d04192b8e2b1 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 05 十二月 2023 21:50:51 +0800
Subject: [PATCH] 增加内容
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index d6f18db..9294d66 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -271,6 +271,11 @@
public AjaxResult selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) {
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -366,6 +371,7 @@
esModel.setRemark(zfEvent.getRemark());
//杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
esModel.setBy5("/family/zfEvent");
+ esModel.setFid(familyId);
esSer.insertTable(esModel);
return AjaxResult.success();
@@ -464,6 +470,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esSer.findByCtId(dataById.getId(), "瀹跺ぇ浜嬭");
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
if(zfEvent.getAddress()!=null){
@@ -536,11 +546,13 @@
//鍒犻櫎es涓殑鏁版嵁
zfEvents.stream().forEach(zfEvent -> {
EsModel esModel = esSer.findByCtId(zfEvent.getId(), "瀹跺ぇ浜嬭");
- 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);
+ }
}
});
--
Gitblit v1.9.1