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/IZfPropertyServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 0c73e22..0903b1e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -65,6 +65,12 @@
     @Resource
     RestHighLevelClient restHighLevelClient;
 
+    @Resource
+    private IZfPropertyDownloadService zfPropertyDownloadService;
+
+    @Resource
+    private IZfPropertyShareService iZfPropertyShareService;
+
 
 //    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
 //        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
@@ -567,6 +573,9 @@
 
         List<ZfProperty> zfPropertys = listByIds(Arrays.asList(ids));
 
+        if (! (zfPropertyDownloadService.deleteData(ids) && iZfPropertyShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
         if (zfPropertyService.removeByIds(Arrays.asList(ids))) {
 
             //鍒犻櫎es涓殑鏁版嵁
@@ -581,6 +590,8 @@
                     throw new RuntimeException(e);
                 }}
             });
+            System.out.println("15165132165346153246153");
+
             return AjaxResult.success();
         }else {
             return AjaxResult.error();

--
Gitblit v1.9.1