From 17cfbc75dc326f3e5963ee17c99d6516497f8cf1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 17:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
index dee7705..7df3311 100644
--- a/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
+++ b/src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -92,6 +92,12 @@
         <if test="stockrecord.deptId != null and stockrecord.deptId !=''">
             and st.dept_id = #{stockrecord.deptId}
         </if>
+        <if test="stockrecord.startTime!=null and stockrecord.startTime!=''">
+            and st.create_time &gt;= #{stockrecord.startTime}
+        </if>
+        <if test="stockrecord.endTime!=null and stockrecord.endTime!=''">
+            and st.create_time &lt;= #{stockrecord.endTime}
+        </if>
         ORDER BY st.create_time desc
     </select>
 

--
Gitblit v1.9.3