From 088e8db2bc8f0869bdc2494864992e756eb0e461 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 24 二月 2024 11:35:17 +0800
Subject: [PATCH] 修改了上传接口

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java |   21 ++++++++++++++++-----
 1 files changed, 16 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 e925a07..549dd62 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
@@ -289,6 +289,11 @@
 
         //瑕佹煡鑷繁瀹跺涵鐨�
         ZInfoUser myself = zInfoUserService.getMyself();
+        if(myself==null)
+        {
+            //   System.out.println("ssssss");
+            return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠$悊鍛�");
+        }
         Long familyId = myself.getFamilyId();
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -486,6 +491,10 @@
             //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭f潯鏁版嵁鍦╡s鐨刬d
             EsModel esResult = esService.findByCtId(dataById.getId().intValue(), "瀹跺涵璁惧");
 
+            if (esResult == null){
+                return AjaxResult.success();
+            }
+
             //鎿嶄綔es淇敼鏁版嵁
             EsModel newModel = new EsModel();
             if(zfEquipment.getName()!=null){
@@ -565,11 +574,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