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/ZPropertyController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index f8f393f..bb80f76 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -8,8 +8,10 @@
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.ZProperty;
import com.ruoyi.domain.ZfEconomy;
+import com.ruoyi.service.MemoBookService;
import com.ruoyi.service.ZPropertyDownloadService;
import com.ruoyi.service.ZPropertyService;
import com.ruoyi.service.ZPropertyShareService;
@@ -46,6 +48,9 @@
@Autowired
private ZPropertyShareService zPropertyShareService;
+
+ @Autowired
+ private MemoBookService memoBookService;
/**
* 鏌ヨ鎵�鏈夎褰�
@@ -145,6 +150,12 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ for (Long id: ids) {
+ List<MemoBook> memoBookService1 = memoBookService.selectByIdAFid(id,2026L);
+ if (!memoBookService.removeByIds(memoBookService1))
+ return AjaxResult.error();
+ }
+
if (! (zPropertyDownloadService.deleteData(ids) && zPropertyShareService.deleteByContentId(ids) ) ){
return AjaxResult.error();
}
--
Gitblit v1.9.1