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/TSamplingRecordMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
index 7be5a21..1628470 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSamplingRecordMapper.xml
@@ -41,9 +41,12 @@
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND tsr.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
- <if test="query.status != null">
+ <if test="query.status != null and query.status != -1">
and tsr.status = #{query.status}
</if>
+ <if test="query.status == null">
+ and tsr.status != -1
+ </if>
<if test="query.createBy != null and query.createBy !=''">
and tsr.create_by like concat('%', #{query.createBy}, '%')
</if>
--
Gitblit v1.7.1