From 6ff2e616cd1c1e986735c5a8c1f991ab9dfe5ec4 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期日, 04 一月 2026 14:32:59 +0800
Subject: [PATCH] bugfix:token失效时间延长、佣金计算问题等。

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 972f7d3..0eea863 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -133,7 +133,7 @@
 		select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
 			   u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,
 			   u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.code,
-			   ur.role_id AS roleId,sr.role_name AS roleName
+			   ur.role_id AS roleId,sr.role_name AS roleName, u.company_id
 		from sys_user u
 		left join sys_user_role ur on u.user_id = ur.user_id
 		left join sys_role sr on ur.role_id = sr.role_id
@@ -295,7 +295,7 @@
     <select id="selectByCode" resultType="com.ruoyi.common.core.domain.entity.SysUser">
         select * from sys_user
         <where>
-            role_type = 3 and del_flag = 0 and code = #{spreadCode}
+            role_type != 1 and del_flag = 0 and code = #{spreadCode}
         </where>
     </select>
     <select id="getUserByCompanyId" resultType="com.ruoyi.common.core.domain.entity.SysUser"

--
Gitblit v1.7.1