From 61778628282686251e08b6b368a712564731f1fe Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Wed, 17 Apr 2024 11:09:41 +0800
Subject: [PATCH] userleave

---
 .../resources/mapper/system/TdLeaveMapper.xml | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
index b12d3df..54306fb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
@@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TdLeave" id="TdLeaveResult">
         <result property="id"    column="id"    />
-        <result property="userId"    column="userid"    />
-        <result property="userName"    column="username"    />
+        <result property="userId"    column="userId"    />
+        <result property="userName"    column="userName"    />
         <result property="country"    column="country"    />
         <result property="areaname"    column="areaname"    />
         <result property="leavereason"    column="leavereason"    />
@@ -21,14 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTdLeaveVo">
-        select id, username,userid, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate from td_leave
+        select id, userName,userId, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate from td_leave
     </sql>
 
     <select id="selectTdLeaveList" parameterType="TdLeave" resultMap="TdLeaveResult">
         <include refid="selectTdLeaveVo"/>
         <where>
-            <if test="username != null  and username != ''"> and username like concat('%', #{userName}, '%')</if>
-            <if test="userid != null  and userid != ''"> and userid = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and userName like concat('%', #{userName}, '%')</if>
+            <if test="userId != null  and userId != ''"> and userId = #{userId}</if>
             <if test="country != null  and country != ''"> and country = #{country}</if>
             <if test="areaname != null  and areaname != ''"> and areaname like concat('%', #{areaname}, '%')</if>
             <if test="leavereason != null  and leavereason != ''"> and leavereason = #{leavereason}</if>
@@ -50,8 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTdLeave" parameterType="TdLeave" useGeneratedKeys="true" keyProperty="id">
         insert into td_leave
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="username != null">username,</if>
-            <if test="userid != null">userid,</if>
+            <if test="userName != null">userName,</if>
+            <if test="userId != null">userId,</if>
             <if test="country != null">country,</if>
             <if test="areaname != null">areaname,</if>
             <if test="leavereason != null">leavereason,</if>
@@ -64,8 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examinestate != null">examinestate,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="username != null">#{userName},</if>
-            <if test="userid != null">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="userId != null">#{userId},</if>
             <if test="country != null">#{country},</if>
             <if test="areaname != null">#{areaname},</if>
             <if test="leavereason != null">#{leavereason},</if>
@@ -82,8 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTdLeave" parameterType="TdLeave">
         update td_leave
         <trim prefix="SET" suffixOverrides=",">
-            <if test="username != null">username = #{userName},</if>
-            <if test="userid != null">userid = #{userId},</if>
+            <if test="userName != null">userName = #{userName},</if>
+            <if test="userId != null">userId = #{userId},</if>
             <if test="country != null">country = #{country},</if>
             <if test="areaname != null">areaname = #{areaname},</if>
             <if test="leavereason != null">leavereason = #{leavereason},</if>