From 45d90d1e7ba86286e998d1ac4d2cba8e98cd059b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 12 一月 2026 20:52:30 +0800
Subject: [PATCH] feat: 优化内存

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index e94af7a..47e458f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -4,6 +4,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.ruoyi.common.utils.UserUtil;
+import com.ruoyi.system.service.ISysDeptService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +63,8 @@
 
     @Autowired
     protected Validator validator;
+    @Autowired
+    private ISysDeptService sysDeptService;
 
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -301,7 +306,7 @@
      * @return 缁撴灉
      */
     @Override
-    @Transactional
+    
     public int insertUser(SysUser user)
     {
         // 鏂板鐢ㄦ埛淇℃伅
@@ -332,7 +337,7 @@
      * @return 缁撴灉
      */
     @Override
-    @Transactional
+    
     public int updateUser(SysUser user)
     {
         Long userId = user.getUserId();
@@ -354,7 +359,7 @@
      * @param roleIds 瑙掕壊缁�
      */
     @Override
-    @Transactional
+    
     public void insertUserAuth(Long userId, Long[] roleIds)
     {
         userRoleMapper.deleteUserRoleByUserId(userId);
@@ -408,6 +413,24 @@
     public int resetPwd(SysUser user)
     {
         return userMapper.updateUser(user);
+    }
+
+
+    @Override
+    public Long getBranchCompanyIdByUserId(Long userId) {
+        Long branchId=UserUtil.getBranchIdByUserId(userId);
+        if(branchId!=null)return branchId;
+
+        SysUser u=userMapper.selectUserById(userId);
+        if(u!=null){
+            Long deptId= u.getDeptId();
+            branchId= sysDeptService.getBranchCompany(deptId);
+            if(branchId!=null){
+                UserUtil.addUserIdBranch(userId,branchId);
+                return branchId;
+            }
+        }
+        return null;
     }
 
     /**
@@ -492,7 +515,7 @@
      * @return 缁撴灉
      */
     @Override
-    @Transactional
+    
     public int deleteUserById(Long userId)
     {
         // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
@@ -509,7 +532,7 @@
      * @return 缁撴灉
      */
     @Override
-    @Transactional
+    
     public int deleteUserByIds(Long[] userIds)
     {
         for (Long userId : userIds)

--
Gitblit v1.9.1