From 61f9d261edb521fc9d0f23c5f0a116dcd90c6b23 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 14:46:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml
index c4a5091..b51d441 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TLeaveMapper.xml
@@ -55,7 +55,7 @@
</if>
</select>
<select id="leaveList" resultType="com.ruoyi.system.applet.vo.LeaveUserListVO">
- select t1.*,t1.create_time as createTime1
+ select t1.*,t1.create_time as createTime1,t1.start_time as startTime1,t1.end_time as endTime1
from t_leave t1
where
t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
@@ -66,6 +66,12 @@
<if test="query.type == 2">
and t1.leave_person = #{query.userId}
</if>
+ <if test="query.auditStatus!=null and query.auditStatus == 1">
+ and t1.audit_status = 1
+ </if>
+ <if test="query.auditStatus!=null and query.auditStatus != 1">
+ and (t1.audit_status = 2 or t1.audit_status = 3)
+ </if>
<if test="query.userIds != null and query.userIds.size()>0">
AND t1.leave_person IN
<foreach collection="query.userIds" separator="," item="id" open="(" close=")">
--
Gitblit v1.7.1