From 8c2e28027e5cb1867bf7e6b5cfb3f38f9fc12490 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Sat, 9 Aug 2025 15:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=B1=BB=E5=9E=8B=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=90=8E=E5=90=88=E8=AE=A1=E6=95=B0=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D+=E5=AE=A2=E6=88=B7=E9=87=91=E5=B8=81?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/jindouMapper/BeanConsumeMapper.xml |  4 ++--
 src/main/resources/mapper/GoldDetailMapper.xml        | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
index 23a7c65..6130efb 100644
--- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml
+++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
@@ -287,13 +287,13 @@
                 AND fm.dept = #{beanConsumeArticle.dept}
             </if>
             <if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
-                AND fyr.source_name =#{beanConsumeArticle.articleName}
+                AND fyr.source_name LIKE CONCAT('%',#{beanConsumeArticle.articleName}, '%')
             </if>
             <if test="beanConsumeArticle.author != null and beanConsumeArticle.author != ''">
                 AND (SELECT fm2.nickname
                 FROM fx_member fm2
                 WHERE fm2.jwcode = fyr.source_jwcode
-                LIMIT 1)=#{beanConsumeArticle.author}
+                LIMIT 1)LIKE CONCAT('%',#{beanConsumeArticle.author}, '%')
             </if>
             <if test="beanConsumeArticle.articleId != null and beanConsumeArticle.articleId != ''">
                 AND fyr.source_id =#{beanConsumeArticle.articleId}
diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml
index 55676db..dfbac61 100644
--- a/src/main/resources/mapper/GoldDetailMapper.xml
+++ b/src/main/resources/mapper/GoldDetailMapper.xml
@@ -73,13 +73,22 @@
 
     </select>
     <select id="getGold" resultType="com.example.demo.domain.entity.User">
-        select * from user
+        select u.id,u.jwcode,u.name,m.name as market,u.sum_permanent_gold,
+               u.sum_free_june,u.sum_free_december,u.sum_task_gold,
+               u.current_permanent_gold,u.current_free_june,
+               u.current_free_december,u.current_task_gold,
+               u.recharge_num,u.consume_num,
+               u.sum_consume_permanent,u.sum_consume_task,
+               u.sum_consume_free,u.first_recharge,u.create_time,
+               u.update_time
+        from user u
+        left join market m on u.market = m.id
         <where>
             <if test="jwcode != null">
                 and jwcode = #{jwcode}
             </if>
             <if test="markets != null and markets.size > 0">
-                AND user.market IN
+                AND m.name IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>