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

---
 .../src/main/java/com/ruoyi/system/domain/TdLeave.java      | 1 -
 .../src/main/resources/mapper/system/TdLeaveMapper.xml      | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java
index 2fc686a..a37ac0c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java
@@ -29,7 +29,6 @@ public class TdLeave extends BaseEntity
     private Long id;
 
     /** 提交人 */
-    @Excel(name = "提交人")
     private String userId;
 
     @Excel(name = "提交人")
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
index 54306fb..3f8fab3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
@@ -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="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="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="country != null">country = #{country},</if>
             <if test="areaname != null">areaname = #{areaname},</if>
             <if test="leavereason != null">leavereason = #{leavereason},</if>