From f5f22d70397d36fef8c47f9c3aae510133057b83 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 07 五月 2025 15:18:38 +0800
Subject: [PATCH] 用户信息添加tenant_id
---
src/main/java/com/ruoyi/framework/security/LoginUser.java | 22 ++++++++++++++++++++++
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 1 -
src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java | 2 +-
src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java | 4 ----
src/main/resources/mapper/system/SysUserMapper.xml | 3 ++-
src/main/java/com/ruoyi/project/system/domain/SysUser.java | 11 +++++++++++
6 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java b/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java
index 20fd9eb..4ecd7df 100644
--- a/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java
@@ -3,11 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.basic.pojo.SupplierManage;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
@Mapper
public interface SupplierManageMapper extends BaseMapper<SupplierManage> {
-
- @Select("select count(*) from supplier_manage ")
- int selectAll();
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index 8b07b9f..bcf23a8 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -15,7 +15,6 @@
@Override
public void saveSupplier(SupplierManage supplierManage) {
- int i = supplierMapper.selectAll();
supplierMapper.insert(supplierManage);
}
}
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index 93afdff..53459bc 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -71,6 +71,11 @@
*/
private SysUser user;
+ /**
+ * 绉熸埛ID
+ */
+ private Integer tenantId;
+
public LoginUser()
{
}
@@ -87,6 +92,15 @@
this.deptId = deptId;
this.user = user;
this.permissions = permissions;
+ }
+
+ public LoginUser(Long userId, Long deptId, SysUser user,Integer tenantId, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptId = deptId;
+ this.user = user;
+ this.permissions = permissions;
+ this.tenantId = tenantId;
}
public Long getUserId()
@@ -263,4 +277,12 @@
{
return null;
}
+
+ public Integer getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(Integer tenantId) {
+ this.tenantId = tenantId;
+ }
}
diff --git a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java b/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
index 2accafd..e4c55ce 100644
--- a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
+++ b/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java
@@ -60,6 +60,6 @@
public UserDetails createLoginUser(SysUser user)
{
- return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
+ return new LoginUser(user.getUserId(), user.getDeptId(), user, user.getTenantId(), permissionService.getMenuPermission(user));
}
}
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 337bf53..64938d0 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -89,6 +89,9 @@
/** 瑙掕壊ID */
private Long roleId;
+ /** 绉熸埛ID */
+ private Integer tenantId;
+
public SysUser()
{
@@ -297,6 +300,14 @@
this.roleId = roleId;
}
+ public Integer getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(Integer tenantId) {
+ this.tenantId = tenantId;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index 7b626bf..b4e8f37 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -23,6 +23,7 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
+ <result property="tenantId" column="tenant_id" />
<association property="dept" javaType="com.ruoyi.project.system.domain.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -49,7 +50,7 @@
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
- r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+ r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.tenant_id
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
--
Gitblit v1.9.3