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

【7.2.5】【menu】修复菜单模糊查询

pull/37/head
fengshuonan 2022-09-28 11:41:01 +08:00
parent d4be6ac9e0
commit 8e49229ae6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -664,14 +664,19 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
return queryWrapper; return queryWrapper;
} }
if (ObjectUtil.isNotEmpty(sysMenuRequest.getAppCode()) || ObjectUtil.isNotEmpty(sysMenuRequest.getMenuName()) || ObjectUtil.isNotEmpty(sysMenuRequest.getMenuCode())) { // 根据应用查询
queryWrapper.nested( if (ObjectUtil.isNotEmpty(sysMenuRequest.getAppCode())) {
// 根据所属应用查询 queryWrapper.eq(SysMenu::getAppCode, sysMenuRequest.getAppCode());
i -> i.like(ObjectUtil.isNotEmpty(sysMenuRequest.getAppCode()), SysMenu::getAppCode, sysMenuRequest.getAppCode()).or() }
// 根据菜单名称模糊查询
.like(ObjectUtil.isNotEmpty(sysMenuRequest.getMenuName()), SysMenu::getMenuName, sysMenuRequest.getMenuName()).or() // 根据菜单名称模糊查询
// 根据菜单编码模糊查询 if (ObjectUtil.isNotEmpty(sysMenuRequest.getMenuName())) {
.like(ObjectUtil.isNotEmpty(sysMenuRequest.getMenuCode()), SysMenu::getMenuCode, sysMenuRequest.getMenuCode())); queryWrapper.like(SysMenu::getMenuName, sysMenuRequest.getMenuName());
}
// 根据菜单编码模糊查询
if (ObjectUtil.isNotEmpty(sysMenuRequest.getMenuCode())) {
queryWrapper.like(SysMenu::getMenuCode, sysMenuRequest.getMenuCode());
} }
return queryWrapper; return queryWrapper;
@ -760,7 +765,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
// 子节点pids组成 = 当前菜单新pids + 当前菜单id + 子节点自己的pids后缀 // 子节点pids组成 = 当前菜单新pids + 当前菜单id + 子节点自己的pids后缀
String oldParentCodesPrefix = oldPids + SymbolConstant.LEFT_SQUARE_BRACKETS + oldMenu.getMenuId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA; String oldParentCodesPrefix = oldPids + SymbolConstant.LEFT_SQUARE_BRACKETS + oldMenu.getMenuId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA;
String oldParentCodesSuffix = child.getMenuPids().substring(oldParentCodesPrefix.length()); String oldParentCodesSuffix = child.getMenuPids().substring(oldParentCodesPrefix.length());
String menuParentCodes = newPids + SymbolConstant.LEFT_SQUARE_BRACKETS + oldMenu.getMenuId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA + oldParentCodesSuffix; String menuParentCodes =
newPids + SymbolConstant.LEFT_SQUARE_BRACKETS + oldMenu.getMenuId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA + oldParentCodesSuffix;
child.setMenuPids(menuParentCodes); child.setMenuPids(menuParentCodes);
}); });
} }