From aeea3645a89d8e83aa476d9280c8cae6d8f81ca8 Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sat, 29 Aug 2020 18:13:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=AE=E5=BD=95,=E5=B0=B1?= =?UTF-8?q?=E5=90=A7=E8=AF=A5=E7=9B=AE=E5=BD=95=E4=B8=8B=E4=B9=A6=E7=AD=BE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/yunbookmark/SqMenuController.java | 10 ++++++++-- .../com/ruoyi/bookmark/mapper/SqBookmarkMapper.java | 8 ++++++++ .../ruoyi/bookmark/service/ISqBookmarkService.java | 8 ++++++++ .../bookmark/service/impl/SqBookmarkServiceImpl.java | 12 ++++++++++++ .../resources/mapper/bookmark/SqBookmarkMapper.xml | 4 ++++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java index 2977157c5..9a2e8e25c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqMenuController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.yunbookmark; import java.util.List; +import com.ruoyi.bookmark.service.ISqBookmarkService; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.sun.org.apache.bcel.internal.generic.NEW; @@ -32,7 +33,8 @@ public class SqMenuController extends BaseController { @Autowired private ISqMenuService sqMenuService; - + @Autowired + private ISqBookmarkService sqBookmarkService; /** * 功能描述:查询用户的 所有书签菜单 */ @@ -143,7 +145,11 @@ public class SqMenuController extends BaseController sqMenu.setParentId(menuId); List sqMenuList=sqMenuService.selectSqMenuList(sqMenu); if (sqMenuList==null||sqMenuList.isEmpty()){ - return toAjax(sqMenuService.deleteSqMenuById(menuId,sysUser.getUserId())); + sqMenuService.deleteSqMenuById(menuId,sysUser.getUserId()); + //修改目录下的所有书签状态为 删除状态 + sqBookmarkService.updateSqBookmarkBymenuId(menuId); + + return toAjax(1); }else{ return AjaxResult.error("删除失败,该目录下级还有目录菜单"); } diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java index 248311737..b19286b98 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqBookmarkMapper.java @@ -70,4 +70,12 @@ public interface SqBookmarkMapper extends MyMapper * @return 结果 */ public int deleteSqBookmarkByIds(Long[] bookmarkIds); + + /** + * 修改目录下书签状态为 删除状态 + * + * @param + * @return 结果 + */ + public void updateSqBookmarkBymenuId(Long menuId); } diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java index 06a18f43a..62a4ba1b6 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqBookmarkService.java @@ -73,4 +73,12 @@ public interface ISqBookmarkService * @return 结果 */ public int deleteSqBookmarkById(Long bookmarkId); + + /** + * 修改目录下书签状态为 删除状态 + * + * @param + * @return 结果 + */ + public void updateSqBookmarkBymenuId(Long menuId); } diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java index 28eff882c..f6f466132 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqBookmarkServiceImpl.java @@ -111,4 +111,16 @@ public class SqBookmarkServiceImpl implements ISqBookmarkService { return sqBookmarkMapper.deleteSqBookmarkById(bookmarkId); } + + + /** + * 修改目录下书签状态为 删除状态 + * + * @param + * @return 结果 + */ + @Override + public void updateSqBookmarkBymenuId(Long menuId) { + sqBookmarkMapper.updateSqBookmarkBymenuId(menuId); + } } diff --git a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml index 55b9a2949..431a4e9d7 100644 --- a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml +++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqBookmarkMapper.xml @@ -97,6 +97,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where bookmark_id = #{bookmarkId} + + update sq_bookmark set IDelete = 1 where menu_id = #{menuId} + + delete from sq_bookmark where bookmark_id = #{bookmarkId}