代码备份

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>
 

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">