From 1283b228a9ac358f734752aaacb27f2db29ffa28 Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Tue, 14 May 2019 15:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AFsql$?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA#?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper_xml/AccountMapperEx.xml  | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/mapper_xml/AccountMapperEx.xml b/src/main/resources/mapper_xml/AccountMapperEx.xml
index d2ed1259..ff2e11f1 100644
--- a/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -19,14 +19,17 @@
         select *
         FROM jsh_account
         where 1=1
-        <if test="name != null">
-            and name like '%${name}%'
+        <if test="name != null and name != ''">
+            <bind name="name" value="'%' + _parameter.name + '%'"/>
+            and name like #{name}
         </if>
-        <if test="serialNo != null">
-            and SerialNo like '%${serialNo}%'
+        <if test="serialNo != null and serialNo != ''">
+            <bind name="serialNo" value="'%' + _parameter.serialNo + '%'"/>
+            and SerialNo like #{serialNo}
         </if>
-        <if test="remark != null">
-            and remark like '%${remark}%'
+        <if test="remark != null and remark != ''">
+            <bind name="remark" value="'%' + _parameter.remark + '%'"/>
+            and remark like #{remark}
         </if>
         and ifnull(delete_Flag,'0') !='1'
         <if test="offset != null and rows != null">
@@ -39,14 +42,17 @@
         COUNT(id)
         FROM jsh_account
         WHERE 1=1
-        <if test="name != null">
-            and name like '%${name}%'
+        <if test="name != null and name != ''">
+            <bind name="name" value="'%' + _parameter.name + '%'"/>
+            and name like #{name}
         </if>
-        <if test="serialNo != null">
-            and SerialNo like '%${serialNo}%'
+        <if test="serialNo != null and serialNo != ''">
+            <bind name="serialNo" value="'%' + _parameter.serialNo + '%'"/>
+            and SerialNo like #{serialNo}
         </if>
-        <if test="remark != null">
-            and remark like '%${remark}%'
+        <if test="remark != null and remark != ''">
+            <bind name="remark" value="'%' + _parameter.remark + '%'"/>
+            and remark like #{remark}
         </if>
         and ifnull(delete_Flag,'0') !='1'
     </select>
@@ -57,7 +63,7 @@
         from jsh_depothead dh inner join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
         where 1=1
         <if test="accountId != null">
-            and dh.AccountId=${accountId}
+            and dh.AccountId=#{accountId}
         </if>
         and ifnull(dh.delete_Flag,'0') !='1'
 
@@ -67,7 +73,7 @@
         from jsh_accounthead ah inner join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
         where 1=1
         <if test="accountId != null">
-            and ah.AccountId=${accountId}
+            and ah.AccountId=#{accountId}
         </if>
         and ifnull(ah.delete_Flag,'0') !='1'
         <!--明细中涉及的账户（收款,付款,收预付款） -->
@@ -77,7 +83,7 @@
         inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
         where ah.Type in ('收款','付款','收预付款')
         <if test="accountId != null">
-            and ai.AccountId=${accountId}
+            and ai.AccountId=#{accountId}
         </if>
         and ifnull(ah.delete_Flag,'0') !='1'
         <!--主表中转出的账户 -->
@@ -86,7 +92,7 @@
         from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
         where ah.Type='转账'
         <if test="accountId != null">
-            and ah.AccountId=${accountId}
+            and ah.AccountId=#{accountId}
         </if>
         and ifnull(ah.delete_Flag,'0') !='1'
         <!--明细中被转入的账户 -->
@@ -95,7 +101,7 @@
         from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
         where ah.Type='转账'
         <if test="accountId != null">
-            and ai.AccountId=${accountId}
+            and ai.AccountId=#{accountId}
         </if>
         and ifnull(ah.delete_Flag,'0') !='1'
         <!--多账户的情况 -->
@@ -104,8 +110,13 @@
         dh.AccountIdList as AList,dh.AccountMoneyList as AMList
         from jsh_depothead dh inner join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
         where 1=1
+        <if test="accountId != null and remark != ''">
+            <bind name="remark" value="'%' + _parameter.remark + '%'"/>
+            and remark like #{remark}
+        </if>
         <if test="accountId != null">
-            and dh.AccountIdList like '%${accountId}%'
+            <bind name="accountId" value="'%' + _parameter.accountId + '%'"/>
+            and dh.AccountIdList like #{accountId}
         </if>
         and ifnull(dh.delete_Flag,'0') !='1'
         ORDER BY oTime desc
@@ -122,7 +133,7 @@
             from jsh_depothead dh inner join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
             where 1=1
             <if test="accountId != null">
-                and dh.AccountId=${accountId}
+                and dh.AccountId=#{accountId}
             </if>
             and ifnull(dh.delete_Flag,'0') !='1'
             <!--主表收入和支出涉及的账户 -->
@@ -131,7 +142,7 @@
             from jsh_accounthead ah inner join jsh_supplier s on ah.OrganId=s.id and ifnull(s.delete_Flag,'0') !='1'
             where 1=1
             <if test="accountId != null">
-                and ah.AccountId=${accountId}
+                and ah.AccountId=#{accountId}
             </if>
             and ifnull(ah.delete_Flag,'0') !='1'
             <!--明细中涉及的账户（收款,付款,收预付款） -->
@@ -141,7 +152,7 @@
             inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
             where ah.Type in ('收款','付款','收预付款')
             <if test="accountId != null">
-                and ai.AccountId=${accountId}
+                and ai.AccountId=#{accountId}
             </if>
             and ifnull(ah.delete_Flag,'0') !='1'
             <!--主表中转出的账户 -->
@@ -150,7 +161,7 @@
             from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
             where ah.Type='转账'
             <if test="accountId != null">
-                and ah.AccountId=${accountId}
+                and ah.AccountId=#{accountId}
             </if>
             and ifnull(ah.delete_Flag,'0') !='1'
             <!--明细中被转入的账户 -->
@@ -159,7 +170,7 @@
             from jsh_accounthead ah inner join jsh_accountitem ai on ai.HeaderId=ah.Id and ifnull(ai.delete_Flag,'0') !='1'
             where ah.Type='转账'
             <if test="accountId != null">
-                and ai.AccountId=${accountId}
+                and ai.AccountId=#{accountId}
             </if>
             and ifnull(ah.delete_Flag,'0') !='1'
             <!--多账户的情况 -->
@@ -168,7 +179,8 @@
             from jsh_depothead dh inner join jsh_supplier s on dh.OrganId = s.id and ifnull(s.delete_Flag,'0') !='1'
             where 1=1
             <if test="accountId != null">
-                and dh.AccountIdList like '%${accountId}%'
+                <bind name="accountId" value="'%' + _parameter.accountId + '%'"/>
+                and dh.AccountIdList like #{accountId}
             </if>
             and ifnull(dh.delete_Flag,'0') !='1'
         ) cc