Browse Source

Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250728171217-三期金豆消费相关' into milestone-20250727-金币重构三期

huangqizheng/feature-20250805200446-配置修改及充值导出修改
lijianlin 2 weeks ago
parent
commit
bab9bbf578
  1. 2
      src/main/resources/jindouMapper/BeanConsumeMapper.xml

2
src/main/resources/jindouMapper/BeanConsumeMapper.xml

@ -281,7 +281,7 @@
AND fm.dept = #{beanConsumeArticle.dept} AND fm.dept = #{beanConsumeArticle.dept}
</if> </if>
<if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''"> <if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
AND fyr.source_name =#{beanConsumeArticle.ArticleName}
AND fyr.source_name =#{beanConsumeArticle.articleName}
</if> </if>
<if test="beanConsumeArticle.author != null and beanConsumeArticle.author != ''"> <if test="beanConsumeArticle.author != null and beanConsumeArticle.author != ''">
AND (SELECT fm2.nickname AND (SELECT fm2.nickname

Loading…
Cancel
Save