From 65f4169ec3fdbdeebcd94dd7fe1855b53d41794e Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Mon, 10 Jun 2019 10:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AF=E8=83=BD=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84sql=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper_xml/DepotHeadMapperEx.xml          | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 307d7aec..4b5df748 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -68,11 +68,15 @@
         <if test="endTime != null and endTime != ''">
             and dh.OperTime &lt;= #{endTime}
         </if>
-        <if test="materialParam != null">
-            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        <if test="materialParam != null and materialParam != ''">
+            <bind name="materialParam" value="'%' + _parameter.materialParam + '%'"/>
+            and (m.Name like #{materialParam} or m.Model like #{materialParam})
         </if>
-        <if test="depotIds != null">
-            and di.DepotId in (${depotIds})
+        <if test="depotIds != null and depotIds != ''">
+            and di.DepotId in
+            <foreach item="did" index="index" collection="depotIds.split(',')" open="(" separator="," close=")">
+                #{did}
+            </foreach>
         </if>
         and ifnull(dh.delete_Flag,'0') !='1'
         order by dh.Id desc
@@ -103,11 +107,15 @@
         <if test="endTime != null and endTime != ''">
             and dh.OperTime &lt;= #{endTime}
         </if>
-        <if test="materialParam != null">
-            and (m.`Name` like '%${materialParam}%' or m.Model like '%${materialParam}%')
+        <if test="materialParam != null and materialParam != ''">
+            <bind name="materialParam" value="'%' + _parameter.materialParam + '%'"/>
+            and (m.Name like #{materialParam} or m.Model like #{materialParam})
         </if>
-        <if test="depotIds != null">
-            and di.DepotId in (${depotIds})
+        <if test="depotIds != null and depotIds != ''">
+            and di.DepotId in
+            <foreach item="did" index="index" collection="depotIds.split(',')" open="(" separator="," close=")">
+                #{did}
+            </foreach>
         </if>
         and ifnull(dh.delete_Flag,'0') !='1'
     </select>