From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 89a84f6..e0276a0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleDeptMapper;
+import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
@@ -37,6 +38,9 @@
@Autowired
private SysRoleMenuMapper roleMenuMapper;
+
+ @Autowired
+ private SysMenuMapper menuMapper;
@Autowired
private SysUserRoleMapper userRoleMapper;
@@ -80,6 +84,12 @@
}
}
return roles;
+ }
+
+ @Override
+ public List<SysRole> selectAssignedRolesByUserId(Long userId)
+ {
+ return roleMapper.selectRolePermissionByUserId(userId);
}
/**
@@ -295,7 +305,14 @@
int rows = 1;
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
- for (Long menuId : role.getMenuIds())
+ Set<Long> menuIds = new HashSet<Long>();
+ if (role.getMenuIds() != null)
+ {
+ menuIds.addAll(Arrays.asList(role.getMenuIds()));
+ }
+ // 鍗扮珷浣跨敤鐧昏闈㈠悜鎵�鏈夎鑹诧紱鏂板缓鎴栫紪杈戣鑹叉椂涓�骞朵繚鐣欓〉闈€�佺埗鑿滃崟鍙婃搷浣滄潈闄愩��
+ menuIds.addAll(menuMapper.selectSealUsageLedgerAccessMenuIds());
+ for (Long menuId : menuIds)
{
SysRoleMenu rm = new SysRoleMenu();
rm.setRoleId(role.getRoleId());
--
Gitblit v1.9.3