From 17d16eddacf32b37686f2e08ddca3919dca7f845 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 九月 2023 10:26:03 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml
index 6a54d47..3f5e8a1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerCreditsExchangeMapper.xml
@@ -88,7 +88,8 @@
                 and vce.condition=#{condition}
             </if>
             <if test="userName!=null">
-                and ((select su.name from sys_user as su where su.user_id=vce.user_id) like concat('%',#{userName},'%')
+                and ((select su.name from sys_user as su where su.user_id=vce.user_id) like concat('%',#{userName},'%') or
+                ((select su.phone from sys_user as su where su.user_id=vce.user_id) like concat('%',#{userName},'%')
             </if>
             <if test="communityId!=null">
                 and vce.community_id=#{communityId}
@@ -96,12 +97,12 @@
             <if test="userId!=null">
                 and vce.user_id=#{userId}
             </if>
-            <if test="merchantId!=null">
-                and vce.merchant_id=#{merchantId}
-            </if>
             <if test="orderType!=null">
                 and vce.order_type=#{orderType}
             </if>
+            <if test="merchantId!=null">
+                and vce.merchant_id=#{merchantId}
+            </if>
         </where>
         order by vce.creation_time desc
     </select>

--
Gitblit v1.7.1