From a655f2f99a86dc48dc33da92ed83b22d79f43f04 Mon Sep 17 00:00:00 2001
From: xioayue <xc@xyiege.com>
Date: Sat, 23 Jul 2022 10:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=90=9C=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/AdminAccountCloseController.java    |  4 +--
 .../resources/mapper/szwh/OrderUserMapper.xml | 32 +++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
index c8c8fe2..4532de9 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
@@ -36,7 +36,7 @@ public class AdminAccountCloseController extends BaseController {
         // 结算人
         String userName=request.getParameter("user_name");
         if(StringUtils.isNotBlank(userName)){
-            qmap.put("u.name",userName);
+            qmap.put("name",userName);
         }
         //结算账户
         String closeAccount=request.getParameter("close_account");
@@ -46,7 +46,7 @@ public class AdminAccountCloseController extends BaseController {
         //银行卡号
         String bankAccount= request.getParameter("bank_account");
         if(StringUtils.isNotBlank(bankAccount)){
-            qmap.put("u.publicAccount",bankAccount);
+            qmap.put("publicAccount",bankAccount);
         }
         //状态
         String status =request.getParameter("status");
diff --git a/src/main/resources/mapper/szwh/OrderUserMapper.xml b/src/main/resources/mapper/szwh/OrderUserMapper.xml
index f83bbdf..9bf6d8c 100644
--- a/src/main/resources/mapper/szwh/OrderUserMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderUserMapper.xml
@@ -32,19 +32,25 @@
     SELECT u.islicode as islicode,u.`name`,u.publicAccount,
     u.bankName,u.userType,o.close_status FROM order_user u
     INNER JOIN `order` o ON u.batchcode=o.batchcode
-    WHERE
-      <if test="map!=null">
-          <foreach collection="map" item="v" index="k" separator="and">
-              <if test="v != null and v != '' and k!='u.name'">
-                  ${k} = #{v}
-              </if>
-              <if test="k=='u.name'">
-                  u.`name` like CONCAT('%',${v},'%')
-              </if>
-          </foreach>
-          AND
-      </if>
-     u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
+    <where>
+        <if test="map!=null">
+            <foreach collection="map" item="v" index="k" separator="and">
+                <if test="v != null and v != '' and k!='u.name'">
+                    ${k} = #{v}
+                </if>
+                <if test="k=='u.publicAccount'">
+                    u.publicAccount like concat('%',#{v},'%')
+                </if>
+                <if test="k=='u.name'">
+                    u.`name` like concat('%',#{v},'%')
+                </if>
+            </foreach>
+
+        </if>
+        <if test="map==null">
+            u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
+        </if>
+    </where>
     ORDER BY u.id DESC
     </select>