Merge remote-tracking branch 'origin/zuhuduan' into V20230915

dsk-admin/src/main/java/com/dsk/web/controller/system/SysMenuController.java

@@ -2,6 +2,7 @@ package com.dsk.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.lang.tree.Tree;
 import com.dsk.common.annotation.Log;
 import com.dsk.common.constant.TenantConstants;
@@ -67,7 +68,7 @@ public class SysMenuController extends BaseController {
      * 获取企业方案菜单下拉树列表
      * 剔除"企业管理"相关菜单
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
     @GetMapping("/tenantPackageTreeSelect")
     public R<List<Tree<Long>>> tenantPackageTreeSelect(SysMenu menu) {
         List<SysMenu> menus = menuService.selectTenantPackageMenuList(menu, getUserId());

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantController.java

@@ -44,7 +44,7 @@ public class SysTenantController extends BaseController {
      * 查询租户列表
      */
     @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenant:list")
+    @SaCheckPermission(value = "system:tenant:list", orRole = "accountAdmin")
     @GetMapping("/list")
     public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
         return tenantService.queryPageList(bo, pageQuery);
@@ -68,7 +68,7 @@ public class SysTenantController extends BaseController {
      * @param id 主键
      */
     @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenant:query")
+    @SaCheckPermission(value = "system:tenant:query", orRole = "accountAdmin")
     @GetMapping("/{id}")
     public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
         return R.ok(tenantService.queryById(id));
@@ -78,7 +78,7 @@ public class SysTenantController extends BaseController {
      * 新增租户
      */
     @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenant:add")
+    @SaCheckPermission(value = "system:tenant:add", orRole = "accountAdmin")
     @Log(title = "租户", businessType = BusinessType.INSERT)
     @Lock4j
     @RepeatSubmit()
@@ -94,7 +94,7 @@ public class SysTenantController extends BaseController {
      * 修改租户
      */
     @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenant:edit")
+    @SaCheckPermission(value = "system:tenant:edit", orRole = "accountAdmin")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -124,7 +124,7 @@ public class SysTenantController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenant:remove")
+    @SaCheckPermission(value = "system:tenant:remove", orRole = "accountAdmin")
     @Log(title = "租户", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
@@ -160,7 +160,7 @@ public class SysTenantController extends BaseController {
      * @param packageId 套餐id
      */
     @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenant:edit")
+    @SaCheckPermission(value = "system:tenant:edit", orRole = "accountAdmin")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @GetMapping("/syncTenantPackage")
     public R<Void> syncTenantPackage(@NotBlank(message = "企业ID不能为空") String tenantId,

dsk-admin/src/main/java/com/dsk/web/controller/system/SysTenantPackageController.java

@@ -47,8 +47,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 查询租户套餐列表
      */
-    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenantPackage:list")
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission(value = "system:tenantPackage:list", orRole = "accountAdmin")
     @GetMapping("/list")
     public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) {
         return tenantPackageService.queryPageList(bo, pageQuery);
@@ -57,8 +57,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 查询租户套餐下拉选列表
      */
-    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenantPackage:list")
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission(value = "system:tenantPackage:list", orRole = "accountAdmin")
     @GetMapping("/selectList")
     public R<List<SysTenantPackageSelectVo>> selectList() {
         return R.ok(tenantPackageService.selectList());
@@ -81,8 +81,8 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageId 主键
      */
-    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenantPackage:query")
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission(value = "system:tenantPackage:query", orRole = "accountAdmin")
     @GetMapping("/{packageId}")
     public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long packageId) {
         return R.ok(tenantPackageService.queryById(packageId));
@@ -91,8 +91,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 新增租户套餐
      */
-    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenantPackage:add")
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission(value = "system:tenantPackage:add", orRole = "accountAdmin")
     @Log(title = "租户套餐", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -106,8 +106,8 @@ public class SysTenantPackageController extends BaseController {
     /**
      * 修改租户套餐
      */
-    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenantPackage:edit")
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission(value = "system:tenantPackage:edit", orRole = "accountAdmin")
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -135,8 +135,8 @@ public class SysTenantPackageController extends BaseController {
      *
      * @param packageIds 主键串
      */
-    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY},mode = SaMode.OR)
-    @SaCheckPermission("system:tenantPackage:remove")
+    @SaCheckRole(value = {TenantConstants.SUPER_ADMIN_ROLE_KEY, TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission(value = "system:tenantPackage:remove", orRole = "accountAdmin")
     @Log(title = "租户套餐", businessType = BusinessType.DELETE)
     @DeleteMapping("/{packageIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] packageIds) {

dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java

@@ -91,19 +91,16 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public List<SysMenu> selectTenantPackageMenuList(SysMenu menu, Long userId) {
-        List<SysMenu> menuList = null;
+        List<SysMenu> menuList;
         // 管理员显示所有菜单信息
-        if (LoginHelper.isSuperAdmin(userId)) {
-            menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
-                    .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
-                    .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
-                    .eq(SysMenu::getStatus, "0")
-                    .orderByAsc(SysMenu::getParentId)
-                    .orderByAsc(SysMenu::getOrderNum));
-
-            //过滤企业管理权限,考虑今后权限名称可能会修改,因此以ID作为判断依据
-            menuList = menuList.stream().filter(menu1 -> menu1.getMenuId() != 1693803090698280961L).collect(Collectors.toList());
-        }
+        menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
+                .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
+                .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
+                .eq(SysMenu::getStatus, "0")
+                .orderByAsc(SysMenu::getParentId)
+                .orderByAsc(SysMenu::getOrderNum));
+        //过滤企业管理权限,考虑今后权限名称可能会修改,因此以ID作为判断依据
+        menuList = menuList.stream().filter(menu1 -> menu1.getMenuId() != 1693803090698280961L).collect(Collectors.toList());
         return menuList;
     }