From fb67c1c58e961fc4f972739f05d65528ad2d8c87 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Thu, 31 Oct 2024 17:24:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/system/domain/TdTrain.java | 14 ++++++++++++++
 .../main/resources/mapper/system/TdTrainMapper.xml |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
index 6ddbd26f..9829846b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
@@ -98,6 +98,19 @@ public class TdTrain extends BaseEntity
     @Excel(name = "培训评价")
     private String TRAININFO;
 
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    /**
+     * 部门
+     */
+    private Long deptId;
+
     public void setID(Long ID) 
     {
         this.ID = ID;
@@ -302,6 +315,7 @@ public class TdTrain extends BaseEntity
             .append("trainTimeend", getTrainTimeend())
             .append("PART", getPART())
             .append("TRAININFO", getTRAININFO())
+            .append("deptId", getDeptId())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
index 91c87729..0858d2a5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
@@ -25,10 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="trainTimeend"    column="TRAIN_TIMEEND"    />
         <result property="PART"    column="PART"    />
         <result property="TRAININFO"    column="TRAININFO"    />
+        <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="selectTdTrainVo">
-        select ID, USERNAME, DEPT_NAME, TRAIN_TYPE, TRAIN_SUBJECT, TRAIN_ADDRESS, TRAIN_DATE, CREATE_STAFFID, CREATE_DEPARTID, CREATE_DATE, UPDATE_DEPARTID, UPDATE_STAFFID, UPDATE_DATE, AREAID, FRAMEWORK, TRAIN_NAME, TRAIN_STATE, TRAIN_TIMEEND, PART, TRAININFO from td_train
+        select ID, USERNAME, DEPT_NAME, TRAIN_TYPE, TRAIN_SUBJECT, TRAIN_ADDRESS, TRAIN_DATE, CREATE_STAFFID, CREATE_DEPARTID, CREATE_DATE, UPDATE_DEPARTID, UPDATE_STAFFID, UPDATE_DATE, AREAID, FRAMEWORK, TRAIN_NAME, TRAIN_STATE, TRAIN_TIMEEND, PART, TRAININFO,dept_id from td_train
     </sql>
 
     <select id="selectTdTrainList" parameterType="TdTrain" resultMap="TdTrainResult">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null "> and TRAIN_TIMEEND = #{trainTimeend}</if>
             <if test="PART != null  and PART != ''"> and PART = #{PART}</if>
             <if test="TRAININFO != null  and TRAININFO != ''"> and TRAININFO = #{TRAININFO}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
         </where>
         order by CREATE_DATE desc
     </select>
@@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null">TRAIN_TIMEEND,</if>
             <if test="PART != null">PART,</if>
             <if test="TRAININFO != null">TRAININFO,</if>
+            <if test="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="USERNAME != null">#{USERNAME},</if>
@@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null">#{trainTimeend},</if>
             <if test="PART != null">#{PART},</if>
             <if test="TRAININFO != null">#{TRAININFO},</if>
+            <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>
 
@@ -130,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainTimeend != null">TRAIN_TIMEEND = #{trainTimeend},</if>
             <if test="PART != null">PART = #{PART},</if>
             <if test="TRAININFO != null">TRAININFO = #{TRAININFO},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
         </trim>
         where ID = #{ID}
     </update>

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 2/3] =?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 6f9bddf1..3eb03194 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 c1afbf6a..6f992a88 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>

From b6f52f1dfd97a429fc933c598ffb7d3b361b3211 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 31 Oct 2024 17:31:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/templates/system/leave/add.html  | 1 +
 ruoyi-admin/src/main/resources/templates/system/leave/edit.html | 1 +
 .../main/resources/templates/system/property/property/add.html  | 1 +
 .../main/resources/templates/system/property/property/edit.html | 1 +
 ruoyi-admin/src/main/resources/templates/system/train/edit.html | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/add.html b/ruoyi-admin/src/main/resources/templates/system/leave/add.html
index 122df9b9..b4004170 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/add.html
@@ -9,6 +9,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-leave-add" th:object="${addleave}">
             <input name="userId" type="hidden" th:value="*{userId}" id="userId"/>
+            <input name="deptId"  type="hidden" id="treeId"/>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">人员姓名：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
index 70935185..d369233f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/edit.html
@@ -9,6 +9,7 @@
         <form class="form-horizontal m" id="form-leave-edit" th:object="${tdLeave}">
             <input name="id" th:field="*{id}" type="hidden">
             <input name="userId" type="hidden" th:value="*{userId}" id="userId"/>
+            <input name="deptId"  type="hidden"  th:field="*{deptId}" id="treeId"/>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">人员姓名：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
index 93684aba..057747e0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/add.html
@@ -7,6 +7,7 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-property-add">
+            <input name="deptId" type="hidden" id="treeId"/>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">所属地市：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
index 86726e79..41c792e1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
@@ -8,6 +8,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-property-edit" th:object="${tdPropertyManager}">
             <input name="useId" th:field="*{useId}" type="hidden">
+            <input name="deptId"  type="hidden"  th:field="*{deptId}" id="treeId"/>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">密品编号：</label>
                 <div class="col-sm-8">
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
index 51b48c50..59272ee0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
@@ -9,7 +9,7 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
         <form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}">
             <input name="ID" th:field="*{ID}" type="hidden">
-<!--            <input name="deptId"  type="hidden"  th:field="*{deptId}" id="treeId">-->
+            <input name="deptId"  type="hidden"  th:field="*{deptId}" id="treeId">
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">