From f0dd18b904640cd71df643f38edde41441959362 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 11 Jul 2024 15:40:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AF=BC=E5=85=A5=E6=B5=81=E9=87=8A?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TdLeaveServiceImpl.java      |  3 ++
 .../resources/mapper/system/SysUserMapper.xml |  3 +-
 .../resources/mapper/system/TdLeaveMapper.xml | 34 +++++++++----------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java
index 7e057e6..413c83f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TdLeaveServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.TdLeaveMapper;
@@ -39,6 +41,7 @@ public class TdLeaveServiceImpl implements ITdLeaveService
      * @return 人员离职
      */
     @Override
+    @DataScope(userAlias="u")
     public List<TdLeave> selectTdLeaveList(TdLeave tdLeave)
     {
         return tdLeaveMapper.selectTdLeaveList(tdLeave);
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index af38ae7..cf49a1c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -109,10 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ))
 		</if>
-
-		ORDER BY examinedate desc
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
+		ORDER BY examinedate desc
 
 	</select>
 	
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
index 00d0e0d..c1afbf6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
@@ -21,26 +21,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTdLeaveVo">
-        select id, user_id, user_name, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate from td_leave
+        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
     </sql>
-
     <select id="selectTdLeaveList" parameterType="TdLeave" resultMap="TdLeaveResult">
         <include refid="selectTdLeaveVo"/>
-        <where>
-            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and user_name 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>
-            <if test="depart != null  and depart != ''"> and depart = #{depart}</if>
-            <if test="leavedate != null "> and leavedate = #{leavedate}</if>
-            <if test="workstate != null  and workstate != ''"> and workstate = #{workstate}</if>
-            <if test="leavestate != null  and leavestate != ''"> and leavestate = #{leavestate}</if>
-            <if test="examinename != null  and examinename != ''"> and examinename like concat('%', #{examinename}, '%')</if>
-            <if test="examinedate != null "> and examinedate = #{examinedate}</if>
-            <if test="examinestate != null  and examinestate != ''"> and examinestate = #{examinestate}</if>
-
-        </where>
+        <trim prefix="where" prefixOverrides="and|or">
+            <if test="userId != null  and userId != ''"> and u.user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and u.user_name like concat('%', #{userName}, '%')</if>
+            <if test="country != null  and country != ''"> and u.country = #{country}</if>
+            <if test="areaname != null  and areaname != ''"> and u.areaname like concat('%', #{areaname}, '%')</if>
+            <if test="leavereason != null  and leavereason != ''"> and u.leavereason = #{leavereason}</if>
+            <if test="depart != null  and depart != ''"> and u.depart = #{depart}</if>
+            <if test="leavedate != null "> and u.leavedate = #{leavedate}</if>
+            <if test="workstate != null  and workstate != ''"> and u.workstate = #{workstate}</if>
+            <if test="leavestate != null  and leavestate != ''"> and u.leavestate = #{leavestate}</if>
+            <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>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </trim>
         ORDER BY examinedate ASC
     </select>