From f605b84620bf35bb02a2ee5ef2086c164b520e67 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 16 一月 2026 16:16:36 +0800
Subject: [PATCH] 浪潮对接单点登录:MES制造执行系统功能迁移

---
 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 9fc7b47..615dab8 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -72,7 +72,7 @@
      * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
+    @DataScope(tenantIdFelid = "u")
     public List<SysUser> selectUserList(SysUser user)
     {
         return userMapper.selectUserList(user);
@@ -554,10 +554,8 @@
      * @return
      */
     @Override
+//    @DataScope(tenantIdFelid = "u")
     public List<SysUser> userListNoPage(SysUser user) {
-        //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
-        SysUser loginUser = SecurityUtils.getLoginUser().getUser();
-        user.setTenantId(loginUser.getTenantId());
         return userMapper.selectUserList(user);
     }
 

--
Gitblit v1.9.3