【7.6.0】【sys】【menu options】更新删除菜单功能

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuOptionsServiceImpl.java

@@ -14,10 +14,12 @@ import cn.stylefeng.roses.kernel.sys.modular.menu.mapper.SysMenuOptionsMapper;
 import cn.stylefeng.roses.kernel.sys.modular.menu.pojo.request.SysMenuOptionsRequest;
 import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService;
 import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuService;
+import cn.stylefeng.roses.kernel.sys.modular.role.service.SysRoleMenuOptionsService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -30,12 +32,14 @@ import java.util.Set;
  * @date 2023/06/10 21:28
  */
 @Service
-public class SysMenuOptionsServiceImpl extends ServiceImpl<SysMenuOptionsMapper, SysMenuOptions> implements SysMenuOptionsService,
+public class SysMenuOptionsServiceImpl extends ServiceImpl<SysMenuOptionsMapper, SysMenuOptions> implements SysMenuOptionsService, RemoveMenuCallbackApi {
-        RemoveMenuCallbackApi {
 
     @Resource
     private SysMenuService sysMenuService;
 
+    @Resource
+    private SysRoleMenuOptionsService sysRoleMenuOptionsService;
+
     @Override
     public void add(SysMenuOptionsRequest sysMenuOptionsRequest) {
 
@@ -53,9 +57,14 @@ public class SysMenuOptionsServiceImpl extends ServiceImpl<SysMenuOptionsMapper,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void del(SysMenuOptionsRequest sysMenuOptionsRequest) {
+
         SysMenuOptions sysMenuOptions = this.querySysMenuOptions(sysMenuOptionsRequest);
         this.removeById(sysMenuOptions.getMenuOptionId());
+
+        // 删除角色绑定的功能关联
+        sysRoleMenuOptionsService.removeRoleBindOptions(sysMenuOptionsRequest.getMenuOptionId());
     }
 
     @Override

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleMenuOptionsService.java

@@ -71,4 +71,12 @@ public interface SysRoleMenuOptionsService extends IService<SysRoleMenuOptions>
      */
     PageResult<SysRoleMenuOptions> findPage(SysRoleMenuOptionsRequest sysRoleMenuOptionsRequest);
 
+    /**
+     * 删除角色绑定的菜单功能
+     *
+     * @author fengshuonan
+     * @since 2023/6/15 23:38
+     */
+    void removeRoleBindOptions(Long optionsId);
+
 }

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java

@@ -33,8 +33,7 @@ import java.util.Set;
  * @date 2023/06/10 21:29
  */
 @Service
-public class SysRoleMenuOptionsServiceImpl extends ServiceImpl<SysRoleMenuOptionsMapper, SysRoleMenuOptions> implements
+public class SysRoleMenuOptionsServiceImpl extends ServiceImpl<SysRoleMenuOptionsMapper, SysRoleMenuOptions> implements SysRoleMenuOptionsService, RemoveRoleCallbackApi, RoleAssignOperateAction, RemoveMenuCallbackApi {
-        SysRoleMenuOptionsService, RemoveRoleCallbackApi, RoleAssignOperateAction, RemoveMenuCallbackApi {
 
     @Override
     public void add(SysRoleMenuOptionsRequest sysRoleMenuOptionsRequest) {
@@ -68,6 +67,13 @@ public class SysRoleMenuOptionsServiceImpl extends ServiceImpl<SysRoleMenuOption
         return PageResultFactory.createPageResult(sysRolePage);
     }
 
+    @Override
+    public void removeRoleBindOptions(Long optionsId) {
+        LambdaQueryWrapper<SysRoleMenuOptions> sysRoleMenuOptionsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysRoleMenuOptionsLambdaQueryWrapper.eq(SysRoleMenuOptions::getMenuOptionId, optionsId);
+        this.remove(sysRoleMenuOptionsLambdaQueryWrapper);
+    }
+
     @Override
     public List<SysRoleMenuOptions> findList(SysRoleMenuOptionsRequest sysRoleMenuOptionsRequest) {
         LambdaQueryWrapper<SysRoleMenuOptions> wrapper = this.createWrapper(sysRoleMenuOptionsRequest);