suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
feng.li
2023-12-27 14:28:33 +08:00
parent 9f6194912f 53f04491b4
commit ac81c9111b
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java
View File

@@ -91,7 +91,7 @@ public class HyExhibitionDAO {
}
public Map<String,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<Integer> list) {
public Map<Integer,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<Integer> list) {
if (CollectionUtils.isEmpty(list)) {
return new HashMap<>(4);
}

2
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -116,7 +116,7 @@
</if>
</if>
<if test="partnerUserId != null and partnerUserId!=''">
and hpui.user_id = #{partnerUserId,jdbcType=VARCHAR}
and hpui.partner_id = #{partnerUserId,jdbcType=VARCHAR}
</if>
</where>
<if test="participationStatus == null">