From 74df40997ee5ba8522d01eb7aee2384fcbc4073d Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Thu, 31 Oct 2024 17:29:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=A6=BB=E8=81=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/TdLeave.java    | 16 +++++++++++++++-
 .../resources/mapper/system/TdLeaveMapper.xml    |  7 ++++++-
 2 files changed, 21 insertions(+), 2 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 6f9bddf..3eb0319 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
@@ -84,7 +84,20 @@ public class TdLeave extends BaseEntity
     @Excel(name = "审核意见", readConverterExp = "0=通过,1不通过,2审核中")
     private String examinestate;
 
-    public void setId(Long id) 
+    /**
+     * 部门
+     */
+    private Long deptId;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -209,6 +222,7 @@ public class TdLeave extends BaseEntity
             .append("examinename", getExaminename())
             .append("examinedate", getExaminedate())
             .append("examinestate", getExaminestate())
+            .append("deptId", getDeptId())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
index c1afbf6..6f992a8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="examinename"    column="examinename"    />
         <result property="examinedate"    column="examinedate"    />
         <result property="examinestate"    column="examinestate"    />
+        <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="selectTdLeaveVo">
-        select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate from td_leave u
+        select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate,dept_id from td_leave u
     </sql>
     <select id="selectTdLeaveList" parameterType="TdLeave" resultMap="TdLeaveResult">
         <include refid="selectTdLeaveVo"/>
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examinename != null  and examinename != ''"> and u.examinename like concat('%', #{examinename}, '%')</if>
             <if test="examinedate != null "> and u.examinedate = #{examinedate}</if>
             <if test="examinestate != null  and examinestate != ''"> and u.examinestate = #{examinestate}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </trim>
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examinename != null">examinename,</if>
             <if test="examinedate != null">examinedate,</if>
             <if test="examinestate != null">examinestate,</if>
+            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -78,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examinename != null">#{examinename},</if>
             <if test="examinedate != null">#{examinedate},</if>
             <if test="examinestate != null">#{examinestate},</if>
+            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -96,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="examinename != null">examinename = #{examinename},</if>
             <if test="examinedate != null">examinedate = #{examinedate},</if>
             <if test="examinestate != null">examinestate = #{examinestate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where id = #{id}
     </update>