From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
index c75e147..9b965a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -8,7 +8,9 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.MemoBook;
import com.ruoyi.domain.ZSecret;
+import com.ruoyi.service.MemoBookService;
import com.ruoyi.service.ZSecretDownloadService;
import com.ruoyi.service.ZSecretService;
import com.ruoyi.service.ZSecretShareService;
@@ -45,6 +47,9 @@
@Autowired
private ZSecretDownloadService zSecretDownloadService;
+
+ @Autowired
+ private MemoBookService memoBookService;
/**
* 鏌ヨ鎵�鏈夎褰�
@@ -144,6 +149,11 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ for (Long id: ids) {
+ List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2031L);
+ if (!memoBookService.removeByIds(memoBookService1))
+ return AjaxResult.error();
+ }
if (! (zSecretDownloadService.deleteData(ids) && zSecretShareService.deleteByContentId(ids) ) ){
return AjaxResult.error();
}
--
Gitblit v1.9.1