From 4215ced06b40268e9f3c8ef6915998fbe64013b4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 24 十月 2024 09:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index 89172ef..43e18f0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -62,6 +62,12 @@
     @Resource
     RestHighLevelClient restHighLevelClient;
 
+    @Resource
+    ZfCleanShareService zfCleanShareService;
+
+    @Resource
+    ZfCleanDownloadService zfCleanDownloadService;
+
     private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) {
         LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
         lqw.orderByDesc(ZfClean::getCreateTime);
@@ -605,7 +611,9 @@
         }
 
         List<ZfClean> zfCleans = listByIds(Arrays.asList(ids));
-
+        if (! (zfCleanDownloadService.deleteData(ids) && zfCleanShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
         if (zfCleanService.removeByIds(Arrays.asList(ids))) {
 
             //鍒犻櫎es涓殑鏁版嵁

--
Gitblit v1.9.1