From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 15:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs

---
 src/main/resources/mapper/OrderDetlMapper.xml |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index f57cc3f..5d5fa60 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -69,14 +69,9 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        <if test="batch!=null and batch!='' ">
+            and batch = #{batch}
+        </if>
     </select>
 
     <select id="selectWorkingDetls" resultMap="BaseResultMap">

--
Gitblit v1.9.1