From 633ec5aed640938430dba08b14b70b5fc3170dad Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 14:09:01 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_sbjkxt
---
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 3fb2b5d..b2f5725 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -145,6 +145,7 @@
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
user.setCreateBy(getUsername());
+ user.setTenantId(SecurityUtils.getLoginUser().getTenantId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
}
@@ -279,8 +280,8 @@
@GetMapping("/userListNoPageByTenantId")
public AjaxResult userListNoPageByTenantId(SysUser user){
//鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- user.setTenantId(loginUser.getTenantId());
+// SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ user.setTenantId(SecurityUtils.getLoginUser().getTenantId());
List<SysUser> sysUserList = userService.userListNoPage(user);
return AjaxResult.success(sysUserList);
}
--
Gitblit v1.9.3