From 78649cb2948cc8467a9c5b08a8d8ae1bf968c11c Mon Sep 17 00:00:00 2001 From: Github_lizhw <171332584@qq.com> Date: Mon, 14 Oct 2024 22:53:10 +0800 Subject: [PATCH] =?UTF-8?q?system-tenant=20=E5=A4=9A=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/system/saas/domain/bo/SysSaasMenuBo.java | 5 +++++ .../saas/service/impl/SysSaasMenuServiceImpl.java | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java index a229f2f1b..7d7c51b60 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java @@ -22,6 +22,11 @@ import org.dromara.system.saas.domain.SysSaasMenu; @EqualsAndHashCode(callSuper = true) @AutoMapper(target = SysSaasMenu.class, reverseConvertGenerate = false) public class SysSaasMenuBo extends BaseEntity { + /** + * 应用id + */ + @NotNull(message = "applicationId 不能为空") + private Long applicationId; /** * 菜单ID diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java index b0f627767..537c56449 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java @@ -35,7 +35,6 @@ import java.util.*; public class SysSaasMenuServiceImpl implements ISysSaasMenuService { private final SysSaasMenuMapper baseMapper; - private final SysSaasApplicationMapper applicationMapper; private final Sys2RoleMapper roleMapper; private final Sys2RoleMenuMapper roleMenuMapper; private final Sys2TenantPackageMapper tenantPackageMapper; @@ -63,11 +62,12 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { // 管理员显示所有菜单信息 if (LoginHelper.isSuperAdmin(userId)) { menuList = baseMapper.selectVoList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(menu.getMenuName()), SysSaasMenu::getMenuName, menu.getMenuName()) - .eq(StringUtils.isNotBlank(menu.getVisible()), SysSaasMenu::getVisible, menu.getVisible()) - .eq(StringUtils.isNotBlank(menu.getStatus()), SysSaasMenu::getStatus, menu.getStatus()) - .orderByAsc(SysSaasMenu::getParentId) - .orderByAsc(SysSaasMenu::getOrderNum)); + .eq(ObjectUtil.isNotNull(menu.getApplicationId()), SysSaasMenu::getApplicationId, menu.getApplicationId()) + .like(StringUtils.isNotBlank(menu.getMenuName()), SysSaasMenu::getMenuName, menu.getMenuName()) + .eq(StringUtils.isNotBlank(menu.getVisible()), SysSaasMenu::getVisible, menu.getVisible()) + .eq(StringUtils.isNotBlank(menu.getStatus()), SysSaasMenu::getStatus, menu.getStatus()) + .orderByAsc(SysSaasMenu::getParentId) + .orderByAsc(SysSaasMenu::getOrderNum)); } else { QueryWrapper wrapper = Wrappers.query(); wrapper.inSql("r.role_id", "select role_id from sys2_user_role where user_id = " + userId)