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 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} - AND fyr.source_name =#{beanConsumeArticle.ArticleName} + AND fyr.source_name =#{beanConsumeArticle.articleName} 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 @@ AND ugr.create_time between #{refundAudit.startTime} and #{refundAudit.endTime} + + AND m.name = #{refundAudit.market} + 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 @@