From 607e4ab169b003991ed4788c9dbe0bd1fefc69f3 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 29 七月 2026 23:26:56 +0800
Subject: [PATCH] 各类修复
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 9788e50..d983e2a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -72,6 +72,9 @@
private ISysPermissionService permissionService;
@Resource
+ private PartnerTypeRoleService partnerTypeRoleService;
+
+ @Resource
private ISysConfigService configService;
@Resource
@@ -505,6 +508,7 @@
if (StringUtils.isNull(sysUser)) {
return R.fail("用户名/密码错误");
}
+ sysUser = synchronizePartnerTypeRole(sysUser);
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser);
// 权限集合
@@ -539,6 +543,7 @@
@GetMapping("/getInfo")
public AjaxResult getInfo() {
SysUser user = userService.selectUserById(tokenService.getLoginUser().getUserid());
+ user = synchronizePartnerTypeRole(user);
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
@@ -550,6 +555,14 @@
return ajax;
}
+ private SysUser synchronizePartnerTypeRole(SysUser user) {
+ partnerTypeRoleService.synchronize(user);
+ if (user != null && Integer.valueOf(2).equals(user.getRoleType()) && user.getObjectId() != null) {
+ return userService.selectUserById(user.getUserId());
+ }
+ return user;
+ }
+
/**
* 发送重置密码验证码
--
Gitblit v1.7.1