From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 52618cf..c46db49
--- a/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportFeeYearCollectionDetailServiceDaoImplMapper.xml
@@ -47,6 +47,12 @@
<if test="collectionId !=null and collectionId != ''">
and t.collection_id= #{collectionId}
</if>
+ <if test="collectionIds !=null ">
+ and t.collection_id in
+ <foreach collection="collectionIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
order by t.collection_year
<if test="page != -1 and page != null ">
limit #{page}, #{row}
--
Gitblit v1.8.0