金币退款审核地区查询，管理员地区bug修复

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;

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 != ''">

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}

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