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:
commit
575c777e2d
@ -59,8 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
</if>
|
</if>
|
||||||
<if test="productType != null and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
|
<if test="productType != null and productType != ''"> and ( FIND_IN_SET(#{productType},r.product_type) )</if>
|
||||||
<if test="supplierCode != null and supplierCode != ''">
|
<if test="supplierCode != null and supplierCode != ''">
|
||||||
and CONCAT(',', r.supplier_code, ',')
|
<foreach item="code" collection="supplierCode.split(',')">
|
||||||
REGEXP CONCAT(',(', REPLACE(#{supplierCode}, ',', '|'), '),')
|
and FIND_IN_SET(#{code}, r.supplier_code)
|
||||||
|
</foreach>
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by id desc
|
order by id desc
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user