Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

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

@@ -145,7 +145,7 @@ public class SysTenantController extends BaseController {
     /**
      * 清除动态租户
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole({TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY})
     @GetMapping("/dynamic/clear")
     public R<Void> dynamicClear() {
         TenantHelper.clearDynamic();
@@ -158,7 +158,7 @@ public class SysTenantController extends BaseController {
      * @param tenantId  租户id
      * @param packageId 套餐id
      */
-    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckRole({TenantConstants.SUPER_ADMIN_ROLE_KEY,TenantConstants.DSK_TENANT_ADMIN_ROLE_KEY})
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @GetMapping("/syncTenantPackage")

dsk-common/src/main/java/com/dsk/common/constant/TenantConstants.java

@@ -37,6 +37,16 @@ public interface TenantConstants {
      */
     String TENANT_ADMIN_ROLE_NAME = "管理员";
 
+    /**
+     * 大司空租户管理员角色
+     */
+    String DSK_TENANT_ADMIN_ROLE_KEY = "accountAdmin";
+
+    /**
+     * 大司空租户管理员角色名称
+     */
+    String DSK_TENANT_ADMIN_ROLE_NAME = "企业账号管理员";
+
     /**
      * 默认租户ID
      */

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

@@ -97,7 +97,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             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(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                    .eq(SysMenu::getStatus, "0")
                     .orderByAsc(SysMenu::getParentId)
                     .orderByAsc(SysMenu::getOrderNum));
             menuList = menuList.stream().filter(menu1 -> !menu1.getMenuName().equals("企业管理")).collect(Collectors.toList());