bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'frps/master' into frp-master

This commit is contained in:
syruan 2025-07-30 15:53:43 +08:00
parent 58d40d964a 847e0eaac8
commit c43ec2a116
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml
View File

@ -89,10 +89,8 @@
ws_ma_info
<where>
<if test="maCode != null and maCode != ''">
and ma_code like concat('%', #{maCode}, '%')
</if>
<if test="qrCode != null and qrCode != ''">
and qr_code = #{qrCode}
and (ma_code like concat('%', #{maCode}, '%')
or qr_code = #{maCode})
</if>
</where>
LIMIT 10
@ -115,10 +113,8 @@
LEFT JOIN ma_type mt1 ON mt1.type_id = mt.parent_id
<where>
<if test="maCode != null and maCode != ''">
and mm.ma_code like concat('%', #{maCode}, '%')
</if>
<if test="qrCode != null and qrCode != ''">
and qr_code = #{qrCode}
and (mm.ma_code like concat('%', #{maCode}, '%')
or mm.qr_code = #{maCode})
</if>
</where>
LIMIT 10