opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 09:35:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

system-tenant 多应用多租户支持

Browse Source
This commit is contained in:
Github_lizhw 2024-10-14 22:53:10 +08:00
parent d1198a267c
commit 78649cb294
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java
View File

@ -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

12
ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java
View File

@ -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<SysSaasMenu>()
.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<SysSaasMenu> wrapper = Wrappers.query();
wrapper.inSql("r.role_id", "select role_id from sys2_user_role where user_id = " + userId)