|
@@ -276,7 +276,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
and gi.putaway_flag= "1"
|
|
|
and sc.del_flag=0
|
|
|
and sc.status=0
|
|
|
- <if test="name != null and name != ''"> and gi.name like concat('%', #{name}, '%')</if>
|
|
|
+ <if test="name != null and name != ''"> and (gi.name like concat('%', #{name}, '%') or (gi.name_en like concat('%', #{name}, '%'))</if>
|
|
|
<if test="companyId != null "> and gi.company_id = #{companyId}</if>
|
|
|
<if test="typeId != null "> and find_in_set(#{typeId},gt.ancestors) </if>
|
|
|
<if test="beginPrice != null and beginPrice!='' "> and gi.price >= #{beginPrice}</if>
|