From fc7ebc6bf97d7c4a4a8911c7a5d7cadcbda24719 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期四, 12 六月 2025 17:41:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/dal/mysql/permission/MenuMapper.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/dal/mysql/permission/MenuMapper.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/dal/mysql/permission/MenuMapper.java index 670d3ed..98088d2 100644 --- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/dal/mysql/permission/MenuMapper.java +++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/dal/mysql/permission/MenuMapper.java @@ -22,15 +22,14 @@ default List<MenuDO> selectList(MenuListReqVO reqVO) { return selectList(new LambdaQueryWrapperX<MenuDO>() - .likeIfPresent(MenuDO::getName, reqVO.getName()) - .eqIfPresent(MenuDO::getStatus, reqVO.getStatus())); + .eqIfPresent(MenuDO::getStatus, reqVO.getStatus()) + .likeIfPresent(MenuDO::getName, reqVO.getName())); } - default List<MenuDO> selectAppMenuList(Long tenantId, MenuListReqVO reqVO) { + default List<MenuDO> selectAppMenuList(MenuListReqVO reqVO) { return selectList(new LambdaQueryWrapperX<MenuDO>() .likeIfPresent(MenuDO::getName, reqVO.getName()) - .eqIfPresent(MenuDO::getStatus, reqVO.getStatus()) - .eq(MenuDO::getTenantId, tenantId)); + .eqIfPresent(MenuDO::getStatus, reqVO.getStatus())); } default List<MenuDO> selectListByPermission(String permission) { -- Gitblit v1.9.3