From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
index 394cf09..a6ec0a5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -40,8 +40,11 @@
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND t1.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
- <if test="query.status != null">
- AND t1.audit_status = #{query.auditStatus}
+ <if test="query.status != null and query.status != -1">
+ AND t1.status = #{query.status}
+ </if>
+ <if test="query.status == null">
+ AND t1.status != -1
</if>
<if test="query.teamIds != null and query.teamIds > 0">
AND t1.team_id in
--
Gitblit v1.7.1