Merge commit 'e770cfc39fd992e1822774ae15de3812be158f7f'

This commit is contained in:
2024-09-02 11:28:23 +08:00
2 changed files with 35 additions and 2 deletions

View File

@@ -133,8 +133,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
public List<String> getPermissionList(JSONObject userDto) {
List<String> permission = new LinkedList<>();
// 查看是否为管理员
permission.add("admin");
permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("userId")));
if (userDto.getBoolean("is_admin")) {
permission.add("admin");
}
permission.addAll(sysMenuMapper.getPermissionByUserId(userDto.getString("user_id")));
return permission;
}