菜单查询修改
This commit is contained in:
parent
d9698b5e13
commit
1152ea91fe
|
|
@ -50,17 +50,16 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
|
||||||
public List<MenuVO> getMenu() {
|
public List<MenuVO> getMenu() {
|
||||||
long sysUserId = StpKit.USER.getLoginIdAsLong();
|
long sysUserId = StpKit.USER.getLoginIdAsLong();
|
||||||
List<SysMenu> allMenus = mapper.selectByUserId(sysUserId, "PC".equals(StpKit.USER.getPlatForm()) ? 1 : 0);
|
List<SysMenu> allMenus = mapper.selectByUserId(sysUserId, "PC".equals(StpKit.USER.getPlatForm()) ? 1 : 0);
|
||||||
List<SysUsersRoles> roleList = sysUsersRolesMapper.selectListByQuery(query().select(SysUsersRoles::getRoleId).eq(SysUsersRoles::getUserId, sysUserId));
|
// SysUsersRoles usersRoles = sysUsersRolesMapper.selectOneByQuery(query().select(SysUsersRoles::getRoleId).eq(SysUsersRoles::getUserId, sysUserId));
|
||||||
List<Long> roleIdList = roleList.stream().map(SysUsersRoles::getRoleId).toList();
|
// Long shopId = StpKit.USER.getShopId(0L);
|
||||||
Long shopId = StpKit.USER.getShopId(0L);
|
// Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
|
||||||
Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
|
// boolean isEnableSync = mainShopId.equals(shopId);
|
||||||
boolean isEnableSync = mainShopId.equals(shopId);
|
// if (isEnableSync && roleIdList.contains(2L)) {
|
||||||
if (isEnableSync && roleIdList.contains(2L)) {
|
// List<SysMenu> headShopPromissionList = sysMenuMapper.selectByRoleId(2L);
|
||||||
List<SysMenu> headShopPromissionList = sysMenuMapper.selectByRoleId(2L);
|
// List<SysMenu> branchShopPromissionList = sysMenuMapper.selectByRoleId(3L);
|
||||||
List<SysMenu> branchShopPromissionList = sysMenuMapper.selectByRoleId(3L);
|
// allMenus.removeAll(headShopPromissionList);
|
||||||
allMenus.removeAll(headShopPromissionList);
|
// allMenus.addAll(branchShopPromissionList);
|
||||||
allMenus.addAll(branchShopPromissionList);
|
// }
|
||||||
}
|
|
||||||
|
|
||||||
List<MenuVO> menuVos = allMenus.stream()
|
List<MenuVO> menuVos = allMenus.stream()
|
||||||
.distinct()
|
.distinct()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue