From 4f3b250fb91359d760e2590fbe76715f76bab664 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 25 Apr 2023 11:20:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E4=BD=9C=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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");