From a9d818a56ba203bfc232aed8014d6050ac9004d7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 21 四月 2026 17:55:39 +0800
Subject: [PATCH] 用户信息新增机构ID和机构名称
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 2 +-
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 5 +++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java | 4 ++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 26 ++++++++++++++++++++++++++
4 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index a0d7332..a9c38e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -139,7 +139,7 @@
//鑾峰彇鍗忚皟鍛�
BaseOrganization baseOrganization = new BaseOrganization();
- baseOrganization.setReporterNo(user.getUserName());
+ baseOrganization.setId(user.getOrgId());
baseOrganization.setDelFlag(0);
List<BaseOrganization> baseOrganizations = baseOrganizationService.queryList(baseOrganization);
if (CollectionUtils.isNotEmpty(baseOrganizations) && baseOrganizations.size() > 0) {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 0634e9c..176d0b2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -169,6 +169,16 @@
*/
private String coordinatorName;
+ /**
+ * 宸ヤ綔鍗曚綅ID
+ */
+ private long orgId;
+
+ /**
+ * 宸ヤ綔鍗曚綅ID
+ */
+ private String orgName;
+
public SysUser() {
}
@@ -402,6 +412,22 @@
this.roleId = roleId;
}
+ public Long getOrgId() {
+ return orgId;
+ }
+
+ public void setOrgId(Long orgId) {
+ this.orgId = orgId;
+ }
+
+ public String getOrgName() {
+ return orgName;
+ }
+
+ public void setOrgName(String orgName) {
+ this.orgName = orgName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("userId", getUserId()).append("deptId", getDeptId()).append("userName", getUserName()).append("nickName", getNickName()).append("email", getEmail()).append("phonenumber", getPhonenumber()).append("sex", getSex()).append("avatar", getAvatar()).append("password", getPassword()).append("salt", getSalt()).append("status", getStatus()).append("delFlag", getDelFlag()).append("loginIp", getLoginIp()).append("loginDate", getLoginDate()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark()).append("dept", getDept()).toString();
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java
index 6a34f36..be9c8d6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseOrganizationServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.fasterxml.jackson.databind.ser.Serializers;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,9 @@
@Override
public List<BaseOrganization> queryList(BaseOrganization baseOrganization) {
LambdaQueryWrapper<BaseOrganization> wrappers = Wrappers.lambdaQuery();
+ if (ObjectUtils.isNotEmpty(baseOrganization.getId())) {
+ wrappers.eq(BaseOrganization::getId, baseOrganization.getId());
+ }
if (StringUtils.isNotBlank(baseOrganization.getOrganizationname())) {
wrappers.like(BaseOrganization::getOrganizationname, baseOrganization.getOrganizationname());
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0996f6f..e9f836f 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -28,9 +28,12 @@
<result property="errorTimes" column="error_times"/>
<result property="standardlevel" column="standardlevel"/>
<result property="dingUserId" column="ding_user_id"/>
+ <result property="orgId" column="org_id"/>
+ <result property="orgName" column="org_name"/>
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept"
resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
+
</resultMap>
<resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
@@ -73,6 +76,8 @@
u.create_time,
u.remark,
u.standardlevel,
+ u.org_id,
+ u.org_name,
d.dept_id,
d.parent_id,
d.dept_name,
--
Gitblit v1.9.3