From 9c6131807b50fac0ed6e9f517a6c3f132c7235df Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 01 十二月 2025 17:56:53 +0800
Subject: [PATCH] 修改了一个bug
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 11 +++++++++--
1 files changed, 9 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 95dc3a5..9281dde 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,6 +25,7 @@
<result property="clanId" column="clan_id" />
<result property="remark" column="remark" />
<result property="paid" column="paid" />
+ <result property="remainTime" column="remain_time" />
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -49,7 +50,7 @@
</resultMap>
<sql id="selectUserVo">
- select u.clan_id,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,u.clan_id,u.paid,
+ select u.clan_id,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,u.clan_id,u.paid,u.remain_time,
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
from sys_user u
@@ -199,6 +200,10 @@
select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
</select>
+ <select id="checkEmail" parameterType="SysUser" resultMap="SysUserResult">
+ select user_id, email,nick_name from sys_user where email = #{email} and nick_name = #{nickName} and del_flag = '0' limit 1
+ </select>
+
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
@@ -251,7 +256,9 @@
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
- update_time = sysdate()
+ <if test="paid != null and paid != ''">paid = #{paid},</if>
+ <if test="remainTime != null and remainTime != ''">remain_time = #{remainTime},</if>
+ update_time = sysdate()
</set>
where user_id = #{userId}
</update>
--
Gitblit v1.9.1