From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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..7f54cf3 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);
@@ -320,11 +326,10 @@
//鏌ョ湅鐖舵瘝鐨勬暟鎹細
Long fatherFaId = 0L;
if(myself.getFatherId()!=null)
- System.out.println("1111111111111111111");
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();
@@ -605,7 +610,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