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

This commit is contained in:
syruan 2025-07-30 15:53:43 +08:00
commit c43ec2a116
1 changed files with 4 additions and 8 deletions

View File

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