userleave

ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java

@@ -89,19 +89,19 @@ public class TdLeave extends BaseEntity
         this.id = id;
     }
 
-    public Long getId() 
+    public String getUserId() {
-    {
+        return userId;
-        return id;
     }
-    public void setUserId(String userId)
+
-    {
+    public void setUserId(String userId) {
-        this.userId  = userId;
+        this.userId = userId;
     }
 
-    public String getUserId()
+    public Long getId()
     {
-        return userId;
+        return id;
     }
+
     public void setCountry(String country) 
     {
         this.country = country;

ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml

@@ -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, userId, userName, 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="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>