Merge pull request 'develop' (#325) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/325
This commit is contained in:
heyu 2026-03-11 16:34:31 +08:00
commit 575c777e2d

View File

@ -59,8 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
<if test="productType != null and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
<if test="supplierCode != null and supplierCode != ''">
and CONCAT(',', r.supplier_code, ',')
REGEXP CONCAT(',(', REPLACE(#{supplierCode}, ',', '|'), '),')
<foreach item="code" collection="supplierCode.split(',')">
and FIND_IN_SET(#{code}, r.supplier_code)
</foreach>
</if>
</where>
order by id desc