diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java index 2835460f..6776b85b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysMenuServiceImpl.java @@ -50,17 +50,16 @@ public class SysMenuServiceImpl extends ServiceImpl impl public List getMenu() { long sysUserId = StpKit.USER.getLoginIdAsLong(); List allMenus = mapper.selectByUserId(sysUserId, "PC".equals(StpKit.USER.getPlatForm()) ? 1 : 0); - List roleList = sysUsersRolesMapper.selectListByQuery(query().select(SysUsersRoles::getRoleId).eq(SysUsersRoles::getUserId, sysUserId)); - List roleIdList = roleList.stream().map(SysUsersRoles::getRoleId).toList(); - Long shopId = StpKit.USER.getShopId(0L); - Long mainShopId = shopInfoService.getMainIdByShopId(shopId); - boolean isEnableSync = mainShopId.equals(shopId); - if (isEnableSync && roleIdList.contains(2L)) { - List headShopPromissionList = sysMenuMapper.selectByRoleId(2L); - List branchShopPromissionList = sysMenuMapper.selectByRoleId(3L); - allMenus.removeAll(headShopPromissionList); - allMenus.addAll(branchShopPromissionList); - } +// SysUsersRoles usersRoles = sysUsersRolesMapper.selectOneByQuery(query().select(SysUsersRoles::getRoleId).eq(SysUsersRoles::getUserId, sysUserId)); +// Long shopId = StpKit.USER.getShopId(0L); +// Long mainShopId = shopInfoService.getMainIdByShopId(shopId); +// boolean isEnableSync = mainShopId.equals(shopId); +// if (isEnableSync && roleIdList.contains(2L)) { +// List headShopPromissionList = sysMenuMapper.selectByRoleId(2L); +// List branchShopPromissionList = sysMenuMapper.selectByRoleId(3L); +// allMenus.removeAll(headShopPromissionList); +// allMenus.addAll(branchShopPromissionList); +// } List menuVos = allMenus.stream() .distinct()