From 544e94379a8ed544e98fe4160f1fb7113987ca34 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 二月 2025 17:07:55 +0800
Subject: [PATCH] #新增 1. 添加库存信息页面 2. 添加库存信息明细页面 3. 添加质检信息页面 4. 添加合信息页面 5. 添加库位信息页面 6. 添加容器管理界面

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
index d9d6d25..a08797c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/UserServiceImpl.java
@@ -35,17 +35,19 @@
         if (Cools.isEmpty(username)) {
             return null;
         }
-        User user = baseMapper.selectByUsername(username, tenantId);
-        if (user != null) {
-            user.setRoles(userRoleService.listByUserId(user.getId()));
-            user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));
-        }
-        return user;
+        return baseMapper.selectByUsernameWithoutTenant(username, tenantId);
     }
 
     @Override
-    public User getByIdRel(Long userId) {
-        User user = this.getById(userId);
+    public User getByEmail(String email, Long tenantId) {
+        if (Cools.isEmpty(email)) {
+            return null;
+        }
+        return baseMapper.selectByEmailWithoutTenant(email, tenantId);
+    }
+
+    @Override
+    public User setUserAuthInfo(User user) {
         if (user != null) {
             user.setRoles(userRoleService.listByUserId(user.getId()));
             user.setAuthorities(roleMenuService.listMenuByUserId(user.getId(), null));

--
Gitblit v1.9.1