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
---
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 1aacbf0..f8f393f 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
@@ -10,7 +10,9 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZfEconomy;
+import com.ruoyi.service.ZPropertyDownloadService;
import com.ruoyi.service.ZPropertyService;
+import com.ruoyi.service.ZPropertyShareService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -38,6 +40,12 @@
public class ZPropertyController extends BaseController {
@Autowired
private ZPropertyService zPropertyService;
+
+ @Autowired
+ private ZPropertyDownloadService zPropertyDownloadService;
+
+ @Autowired
+ private ZPropertyShareService zPropertyShareService;
/**
* 鏌ヨ鎵�鏈夎褰�
@@ -137,6 +145,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ if (! (zPropertyDownloadService.deleteData(ids) && zPropertyShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
return toAjax(zPropertyService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.1