From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp

---
 src/main/resources/mapper/ViewStockUseMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/ViewStockUseMapper.xml b/src/main/resources/mapper/ViewStockUseMapper.xml
index 1bd682c..148e133 100644
--- a/src/main/resources/mapper/ViewStockUseMapper.xml
+++ b/src/main/resources/mapper/ViewStockUseMapper.xml
@@ -152,7 +152,10 @@
 			 </if>
 
 			) a ) b
-	WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+	WHERE 1=1
+	<if test="curr != null and curr !=''">
+		and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+	</if>
 
 </select>
 <select id="selectWorkCountInTotal" resultType="java.lang.Integer">
@@ -183,7 +186,10 @@
 		and matnr = #{matnr}
 	</if>
 	) a ) b
-	WHERE 1=1 and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+	WHERE 1=1
+	<if test="curr != null and curr !=''">
+		and b.row between ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
+	</if>
 </select>
 <select id="selectWorkCountOutTotal" resultType="java.lang.Integer">
 	SELECT COUNT(*) FROM asr_wrkout_count_view

--
Gitblit v1.9.1