|
@@ -270,9 +270,13 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
|
|
List<XjrMenuGroup> xjrMenuGroupMenu = xjrMenuGroupSetService.getXjrMenuGroupMenu();
|
|
List<XjrMenuGroup> xjrMenuGroupMenu = xjrMenuGroupSetService.getXjrMenuGroupMenu();
|
|
Set<Long> menuIds = xjrMenuGroupMenu.stream().map(XjrMenuGroup::getXjrMenuId).collect(Collectors.toSet());
|
|
Set<Long> menuIds = xjrMenuGroupMenu.stream().map(XjrMenuGroup::getXjrMenuId).collect(Collectors.toSet());
|
|
menuGroupMap.putAll(xjrMenuGroupMenu.stream().collect(Collectors.toMap(XjrMenuGroup::getXjrMenuId, XjrMenuGroup::getXjrMenuGroupSetId)));
|
|
menuGroupMap.putAll(xjrMenuGroupMenu.stream().collect(Collectors.toMap(XjrMenuGroup::getXjrMenuId, XjrMenuGroup::getXjrMenuGroupSetId)));
|
|
|
|
+ Long userId = StpUtil.getLoginIdAsLong();
|
|
|
|
+ if(dto.getStudentUserId() != null && roleIds.contains(RoleEnum.PARENT.getCode())){
|
|
|
|
+ userId = dto.getStudentUserId();
|
|
|
|
+ }
|
|
List<WhitelistManagement> managementList = whitelistManagementService.list(
|
|
List<WhitelistManagement> managementList = whitelistManagementService.list(
|
|
new QueryWrapper<WhitelistManagement>().lambda()
|
|
new QueryWrapper<WhitelistManagement>().lambda()
|
|
- .eq(WhitelistManagement::getUserId, StpUtil.getLoginIdAsLong())
|
|
|
|
|
|
+ .eq(WhitelistManagement::getUserId, userId)
|
|
);
|
|
);
|
|
for (XjrMenuGroup menuGroupMenu : xjrMenuGroupMenu) {
|
|
for (XjrMenuGroup menuGroupMenu : xjrMenuGroupMenu) {
|
|
menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 0);
|
|
menuDisabledMap.put(menuGroupMenu.getXjrMenuId(), 0);
|