From 65d0abe9da5f2407d4e9f39653210f9f80d689eb Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Wed, 1 Jun 2022 14:35:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml    | 2 +-
 .../main/resources/mybatis/mapper/inventory/InvProductDao.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
index 7f439d0..b11c466 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
@@ -164,7 +164,7 @@
         #{scbssfbhscrq},
         #{scbssfbhsxrq},
         #{cpms},
-        #{manufactory},#{originUuid},,#{allowNoBatch},#{allowNoExpire},#{allowNoProduct}
+        #{manufactory},#{originUuid},#{allowNoBatch},#{allowNoExpire},#{allowNoProduct}
         )
     </insert>
 
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
index 1ede0ce..b8be93c 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -83,10 +83,10 @@
             <if test="supId == null">
                 AND supId is NULL
             </if>
-            <if test="batchNo != '' and batchNo != null">
+            <if test="batchNo != '' and batchNo != null and batchNo!='empty'">
                 AND batchNo = #{batchNo}
             </if>
-            <if test="batchNo == '' || batchNo == null">
+            <if test="batchNo == 'empty'">
                 AND batchNo is NULL
             </if>
             <if test="invWarehouseCode != '' and invWarehouseCode != null">