diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java index e749561fd4..cc1d4637cb 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java @@ -2,11 +2,11 @@ package com.yxt.anrui.portal.biz.sysmenu; import com.yxt.anrui.portal.api.sysmenu.*; import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery; +import com.yxt.anrui.portal.api.sysrole.SysRole; import com.yxt.anrui.portal.api.syssource.SysSource; import com.yxt.anrui.portal.api.syssource.SysSourceVo; import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenu; import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuVo; -import com.yxt.anrui.portal.api.sysuserrole.SysUserRole; import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo; import com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleService; import com.yxt.anrui.portal.biz.sysrole.SysRoleService; @@ -125,6 +125,10 @@ public class SysMenuRest implements SysMenuFeign { List userRole = sysUserRoleService.selectByUserSid(query.getUserSid()); List roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList()); for (String roleSid : roleSids) { + SysRole sysRole = sysRoleService.fetchBySid(roleSid); + if(sysRole == null){ + continue; + } Integer type = sysRoleService.fetchBySid(roleSid).getType(); if (type == 1){ orgRoleMenuQuery.setIsAdmin("1");