From 37b8dcb6b45ef223c906cdb18c87e5ae6afba88b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sat, 25 Jun 2022 13:12:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/inventory/InvPreInProductDao.xml   | 11 +++++++----
 .../mybatis/mapper/inventory/InvProductDao.xml        |  5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
index bf164549..d8613076 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
@@ -131,10 +131,13 @@
         <where>
             basic_products.diType=1
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND basic_products.cpmctymc = #{cpmctymc}
+                AND basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="productsName != null and productsName != ''">
+                AND basic_products.cpmctymc like concat('%',#{productsName},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND basic_products.nameCode = #{nameCode}
+                AND basic_products.nameCode like concat('%',#{nameCode},'%')
             </if>
             <if test="relIdFk != '' and relIdFk != null">
                 AND inv_prein_product.relIdFk = #{relIdFk}
@@ -147,10 +150,10 @@
             </if>
 
             <if test="ggxh != '' and ggxh != null">
-                AND basic_products.ggxh = #{ggxh}
+                AND basic_products.ggxh = concat('%',#{ggxh},'%')
             </if>
             <if test="batchNo != '' and batchNo != null">
-                AND inv_prein_product.batchNo = #{batchNo}
+                AND inv_prein_product.batchNo like concat('%',#{batchNo},'%')
             </if>
             <if test="productionDate != '' and productionDate != null">
                 AND inv_prein_product.productionDate = #{productionDate}
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 d3e26e67..2ce35a28 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
@@ -126,11 +126,14 @@
         left join inv_warehouse_sub on inv_warehouse_sub.parentId = inv_warehouse.code
         <where>
             basic_products.diType=1
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
+            </if>
             <if test="productsName != '' and productsName != null">
                 AND inv_product.productsName like concat('%',#{productsName},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND inv_product.nameCode = #{nameCode}
+                AND inv_product.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="relIdFk != '' and relIdFk != null">
                 AND inv_product.relIdFk = #{relIdFk}