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/ZSelfNoteController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
index c998d5d..f1c76e1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java
@@ -9,12 +9,15 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZSelfNote;
+import com.ruoyi.service.ZSelfNoteDownloadService;
import com.ruoyi.service.ZSelfNoteService;
+import com.ruoyi.service.ZSelfNoteShareService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
import java.util.Arrays;
@@ -38,6 +41,13 @@
public class ZSelfNoteController extends BaseController {
@Autowired
private ZSelfNoteService zSelfNoteService;
+
+ @Autowired
+ private ZSelfNoteShareService zSelfNoteShareService;
+
+ @Autowired
+ private ZSelfNoteDownloadService zSelfNoteDownloadService;
+
/**
* 鏌ヨ鎵�鏈夎褰�
@@ -132,6 +142,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ if (! (zSelfNoteDownloadService.deleteData(ids) && zSelfNoteShareService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
return toAjax(zSelfNoteService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.1