From 81995abfa712d65b7f7f1e23b97a97bc4065103d Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期五, 25 十月 2024 23:11:30 +0800 Subject: [PATCH] 修改了bug --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSelfNoteController.java | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 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 949ba2c..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; @@ -39,6 +42,13 @@ @Autowired private ZSelfNoteService zSelfNoteService; + @Autowired + private ZSelfNoteShareService zSelfNoteShareService; + + @Autowired + private ZSelfNoteDownloadService zSelfNoteDownloadService; + + /** * 鏌ヨ鎵�鏈夎褰� */ @@ -60,7 +70,7 @@ /** * 妯℃澘 */ - @GetMapping("/model") + @PostMapping("/model") public void getModel(HttpServletResponse response){ ZSelfNote zSelfNote = new ZSelfNote(); List<ZSelfNote> emptyList = Collections.singletonList(zSelfNote); @@ -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