From ca054d1db9256bc8d367486b0d78e89cd4fd7fdb Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 十月 2024 20:41:10 +0800
Subject: [PATCH] 删除时会连着分享和下载的数据一起删掉

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyDownlServiceImpl.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyDownlServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyDownlServiceImpl.java
index dd814a1..1a272f2 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyDownlServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyDownlServiceImpl.java
@@ -96,14 +96,29 @@
     }
 
     @Override
-    public AjaxResult deleteData(Long[] ids) {
-        List<ZfDownload> zfDownloads = listByIds(Arrays.asList(ids));
+    public Boolean deleteData(Long[] ids) {
+        List<Long> id = new ArrayList<>();
 
-        if (zfEconomyShaService.removeByIds(Arrays.asList(ids))) {
+        LambdaQueryWrapper<ZfDownload> lqw = new LambdaQueryWrapper<>();
+        lqw.in(ids != null, ZfDownload::getDownloadContent,  ids)
+                .eq(ZfDownload::getSysMenuId, 2023L);
+
+        List<ZfDownload> zfDownloads = list(lqw);
+        System.out.println(zfDownloads);
+        if (zfDownloads.size() == 0){
+            return true;
+        }
+        for (ZfDownload zfDownload: zfDownloads) {
+            id.add(zfDownload.getId());
+        }
+
+        System.out.println(id);
+
+        if (removeByIds(id)) {
 
             //鍒犻櫎es涓殑鏁版嵁
             zfDownloads.stream().forEach(zfDoctorDownload -> {
-                EsModel esModel = esService.findByCtId(zfDoctorDownload.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处涓嬭浇");
+                EsModel esModel = esService.findByCtId(zfDoctorDownload.getId().intValue(), "瀹跺涵鏀舵敮鍙拌处涓嬭浇鍒犻櫎");
 
                 if (esModel != null) {
                     DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
@@ -114,9 +129,9 @@
                     }
                 }
             });
-            return AjaxResult.success();
+            return true;
         } else {
-            return AjaxResult.error();
+            return false;
         }
     }
 

--
Gitblit v1.9.1