From 22030aad5a70ffc8066b2d28ea4bfbf9b575b036 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Tue, 5 Aug 2025 10:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B8=81=E9=80=80=E6=AC=BE=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=9C=B0=E5=8C=BA=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E5=9C=B0=E5=8C=BAbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java    | 4 ++--
 src/main/resources/jindouMapper/BeanConsumeMapper.xml                 | 2 +-
 src/main/resources/mapper/AuditMapper.xml                             | 3 +++
 src/main/resources/mapper/GeneralMapper.xml                           | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
index 7879ce8..fc4b374 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java
@@ -132,8 +132,8 @@ public class GeneralServiceImpl implements GeneralService {
             //判断是否是总部
             if (list != null && list.contains("总部")||list.contains("研发部")) {
                 List<String> allMarkets = getMarket(); // 获取所有地区
-                allMarkets.remove("1"); // 先移除可能存在的总部
-                allMarkets.add(0, "1"); // 将总部添加到列表第一位
+                allMarkets.remove("总部"); // 先移除可能存在的总部
+                allMarkets.add(0, "总部"); // 将总部添加到列表第一位
                 list = allMarkets; // 更新list
             }
             return list;
diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
index cdf65bd..05712ad 100644
--- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml
+++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml
@@ -230,7 +230,7 @@
                 LIMIT 1)=#{beanConsumeArticle.author}
             </if>
             <if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
-                AND fyr.source_name =#{beanConsumeArticle.ArticleName}
+                AND fyr.source_name =#{beanConsumeArticle.articleName}
             </if>
 
             <if test="beanConsumeArticle.articleId != null and beanConsumeArticle.articleId != ''">
diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml
index 0a54306..17718a8 100644
--- a/src/main/resources/mapper/AuditMapper.xml
+++ b/src/main/resources/mapper/AuditMapper.xml
@@ -134,6 +134,9 @@
             <if test="refundAudit.startTime != null and refundAudit.endTime != null ">
                 AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime}
             </if>
+            <if test="refundAudit.market != null and refundAudit.market != ''">
+                AND  m.name = #{refundAudit.market}
+            </if>
 
             <if test="refundAudit.auditStatus != null and refundAudit.auditStatus != ''">
                 AND ugr.audit_status = #{refundAudit.auditStatus}
diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml
index 74a0fff..06cdbfc 100644
--- a/src/main/resources/mapper/GeneralMapper.xml
+++ b/src/main/resources/mapper/GeneralMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.example.demo.mapper.coin.GeneralMapper">
 
     <select id="getMarket" resultType="java.lang.String">
-            select DISTINCT market from user
+        select DISTINCT name from market where type=2
     </select>
     <select id="getALLAdminMarket" resultType="java.lang.String">
         select DISTINCT market from admin