From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/UserServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/UserServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/UserServiceImpl.java
index 544d67b..a8842d5 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/UserServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/UserServiceImpl.java
@@ -63,4 +63,13 @@
return password == null ? null : bCryptPasswordEncoder.encode(password);
}
+ @Override
+ public User setUserAuthInfo(User user) {
+ if (user != null) {
+ user.setRoles(userRoleService.listByUserId(user.getId()));
+ user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
+ }
+ return user;
+ }
+
}
--
Gitblit v1.9.1