Przeglądaj źródła

fix
菜单删除失败

18339543638 6 miesięcy temu
rodzic
commit
923790a37e

+ 2 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/controller/SysMenuController.java

@@ -1,6 +1,7 @@
 package cn.tr.module.sys.user.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.tr.core.annotation.TenantIgnore;
 import cn.tr.core.pojo.CommonResult;
 import cn.tr.core.pojo.TableDataInfo;
 import cn.tr.core.validation.Insert;
@@ -95,6 +96,7 @@ public class SysMenuController extends BaseController {
     @ApiOperationSupport(author = "lf")
     @ApiOperation(value = "删除菜单",notes = "权限: sys:menu:remove")
     @SaCheckPermission("sys:menu:remove")
+    @TenantIgnore
     public CommonResult<Integer> deleteByIds(@RequestBody Collection<String> ids){
         return CommonResult.success(menuService.deleteSysMenuByIds(ids));
     }

+ 3 - 3
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysMenuServiceImpl.java

@@ -213,11 +213,11 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuRepository,SysMenuPO>
 
     private void refreshCache(Collection<String> source){
         Set<String> roleIds = roleMenuService.findRoleByMenuId(source,true);
-        roleIds.parallelStream().forEach(self::delRoleMenusCache);
+        roleIds.forEach(self::delRoleMenusCache);
         Set<String> packageIds = tenantPackageMenuService.findPackageIdByMenuId(source,true);
-        packageIds.parallelStream().forEach(tenantPackageMenuService::delCacheMenuIdByPackageId);
+        packageIds.forEach(tenantPackageMenuService::delCacheMenuIdByPackageId);
         Set<String> portalIds=portalMenuService.findPortalIdByMenuId(source,true);
-        portalIds.parallelStream().forEach(portalMenuService::delCacheMenusByPortalId);
+        portalIds.forEach(portalMenuService::delCacheMenusByPortalId);
     }
 
     private void findAllChildrenId(TreeNode<String> children, Set<String> result){