From f33f5d962eddbc75f3db8124b14f8a50d93cf625 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 10 十一月 2024 19:37:55 +0800
Subject: [PATCH] 修改了bug

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

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index 7d61d5b..d5d6109 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -63,6 +63,12 @@
     @Resource
     RestHighLevelClient restHighLevelClient;
 
+    @Resource
+    ZfCollectionShareService zfCollectionShareService;
+
+    @Resource
+    ZfCollectionDownloadService zfCollectionDownloadService;
+
     private LambdaQueryWrapper<ZfCollection> buildCondition(ZfCollection zfCollection,List<Long> familyIdList) {
         LambdaQueryWrapper<ZfCollection> lqw = new LambdaQueryWrapper<>();
         lqw.orderByDesc(ZfCollection::getCreateTime);
@@ -322,7 +328,7 @@
             fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
         Long motherFaId = 0L;
         if(myself.getMomId()!=null)
-            motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
 
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -579,7 +585,9 @@
         }
 
         List<ZfCollection> zfCollections = listByIds(Arrays.asList(ids));
-
+        if (! ( zfCollectionDownloadService.deleteData(ids) && zfCollectionShareService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
         if (zfCollectionService.removeByIds(Arrays.asList(ids))) {
 
             //鍒犻櫎es涓殑鏁版嵁

--
Gitblit v1.9.1