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-22 11:32:28 +08:00
parent bb6c152e5f d8a2e6532d
commit b32efa8277
9 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,6 +322,8 @@
start_date as startDate,
close_time as closeTime,
location as location,
closed_type as closedType,
creator as creator,
exhibition_name as exhibitionName,
collaborators as collaboratorStr
from hy_exhibition

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

@@ -426,10 +426,10 @@
on hpe.partner_id = hpui.partner_id
<where>
<if test="partnerName!=null and partnerName!=''">
hpui.username like concat("%", #{partnerName}, "%")
and hpui.username like concat("%", #{partnerName}, "%")
</if>
<if test="id!=null">
hpe.exhibition_id = #{id}
and hpe.exhibition_id = #{id}
</if>
</where>
</select>