gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.0.4】【menu】更新菜单接口

pull/19/MERGE
fengshuonan 2021-05-31 23:54:23 +08:00
parent f95e60c256
commit e70e176548
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java
View File

@ -145,21 +145,14 @@ public interface SysMenuService extends IService<SysMenu> {
*/ */
List<LayuiMenuAndButtonTreeResponse> getMenuAndButtonTree(SysRoleRequest sysRoleRequest, Boolean lateralFlag); List<LayuiMenuAndButtonTreeResponse> getMenuAndButtonTree(SysRoleRequest sysRoleRequest, Boolean lateralFlag);
/**
* 获取当前用户的所有菜单
*
* @author fengshuonan
* @date 2020/12/27 18:11
*/
List<SysMenu> getCurrentUserMenus();
/** /**
* 获取当前用户的某个应用下的菜单 * 获取当前用户的某个应用下的菜单
* *
* @param appCode 应用编码 * @param appCode 应用编码
* @param layuiVisibleFlag layui版本查询查询条件，如果穿true，则会带上layui_visible为Y的查询条件
* @author fengshuonan * @author fengshuonan
* @date 2020/12/27 18:11 * @date 2020/12/27 18:11
*/ */
List<SysMenu> getCurrentUserMenus(String appCode); List<SysMenu> getCurrentUserMenus(String appCode, Boolean layuiVisibleFlag);
} }

16
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java
View File

@ -39,7 +39,6 @@ import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory;
import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.rule.tree.ztree.ZTreeNode;
import cn.stylefeng.roses.kernel.rule.util.ProjectUtil;
import cn.stylefeng.roses.kernel.system.api.AppServiceApi; import cn.stylefeng.roses.kernel.system.api.AppServiceApi;
import cn.stylefeng.roses.kernel.system.api.MenuServiceApi; import cn.stylefeng.roses.kernel.system.api.MenuServiceApi;
import cn.stylefeng.roses.kernel.system.api.RoleServiceApi; import cn.stylefeng.roses.kernel.system.api.RoleServiceApi;
@ -262,7 +261,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
public List<LayuiAppIndexMenusVO> getLayuiIndexMenus() { public List<LayuiAppIndexMenusVO> getLayuiIndexMenus() {
// 获取当前用户所有菜单 // 获取当前用户所有菜单
List<SysMenu> currentUserMenus = this.getCurrentUserMenus(); List<SysMenu> currentUserMenus = this.getCurrentUserMenus(null, true);
// 组装每个应用的菜单树 // 组装每个应用的菜单树
List<LayuiAppIndexMenusVO> layuiAppIndexMenuVOS = LayuiMenusFactory.createLayuiAppIndexMenus(currentUserMenus); List<LayuiAppIndexMenusVO> layuiAppIndexMenuVOS = LayuiMenusFactory.createLayuiAppIndexMenus(currentUserMenus);
@ -284,7 +283,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
// 不分应用查询菜单 // 不分应用查询菜单
List<SysMenu> currentUserMenus = null; List<SysMenu> currentUserMenus = null;
if (sysMenuRequest.getTotalMenus() != null && sysMenuRequest.getTotalMenus()) { if (sysMenuRequest.getTotalMenus() != null && sysMenuRequest.getTotalMenus()) {
currentUserMenus = this.getCurrentUserMenus(null); currentUserMenus = this.getCurrentUserMenus(null, false);
} }
// 根据应用查询菜单 // 根据应用查询菜单
else { else {
@ -292,7 +291,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
if (ObjectUtil.isEmpty(appCode)) { if (ObjectUtil.isEmpty(appCode)) {
appCode = appServiceApi.getActiveAppCode(); appCode = appServiceApi.getActiveAppCode();
} }
currentUserMenus = this.getCurrentUserMenus(appCode); currentUserMenus = this.getCurrentUserMenus(appCode, false);
} }
return AntdMenusFactory.createTotalMenus(currentUserMenus); return AntdMenusFactory.createTotalMenus(currentUserMenus);
@ -404,12 +403,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
} }
@Override @Override
public List<SysMenu> getCurrentUserMenus() { public List<SysMenu> getCurrentUserMenus(String appCode, Boolean layuiVisibleFlag) {
return getCurrentUserMenus(null);
}
@Override
public List<SysMenu> getCurrentUserMenus(String appCode) {
// 菜单查询条件 // 菜单查询条件
LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
@ -423,7 +417,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
} }
// 如果是不分离版本，则筛选一下不需要显示的菜单 // 如果是不分离版本，则筛选一下不需要显示的菜单
if (!ProjectUtil.getSeparationFlag()) { if (layuiVisibleFlag != null && layuiVisibleFlag) {
queryWrapper.eq(SysMenu::getLayuiVisible, YesOrNotEnum.Y.getCode()); queryWrapper.eq(SysMenu::getLayuiVisible, YesOrNotEnum.Y.getCode());
} }