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/ZHonorController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
index 6e909fe..e946234 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
@@ -11,7 +11,9 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZHonor;
+import com.ruoyi.service.ZHonorDownloadService;
import com.ruoyi.service.ZHonorService;
+import com.ruoyi.service.ZHonorShareService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +41,12 @@
public class ZHonorController extends BaseController {
@Autowired
private ZHonorService zHonorService;
+
+ @Autowired
+ private ZHonorDownloadService zHonorDownloadService;
+
+ @Autowired
+ private ZHonorShareService zHonorShareService;
/**
* 鏌ヨ鎵�鏈夎褰�
@@ -128,6 +136,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ if (! (zHonorDownloadService.deleteData(ids) && zHonorShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
return toAjax(zHonorService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.1