diff --git a/emis-oms-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisTransLineMapper.xml index 727ff17..91ca1bc 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisTransLineMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisTransLineMapper.xml @@ -41,10 +41,10 @@ del_flag = '0' and id = #{id} - and line_code like concat('%', #{lineCode}, '%') + and FIND_IN_SET(line_code,#{lineCode}) and line_name like concat('%', #{lineName}, '%') and line_name_en like concat('%', #{lineNameEn}, '%') - and meter_rate like concat('%', #{meterRate}, '%') + and meter_rate=#{meterRate} and status = #{status} and site_audit_man like concat('%', #{siteAuditMan}, '%') and site_audit_man_code like concat('%', #{siteAuditManCode}, '%') @@ -52,11 +52,11 @@ and market_man_code like concat('%', #{marketManCode}, '%') and operate_man like concat('%', #{operateMan}, '%') and operate_man_code like concat('%', #{operateManCode}, '%') - and from_country like concat('%', #{fromCountry}, '%') - and country like concat('%', #{country}, '%') - and apply_scope like concat('%', #{applyScope}, '%') - and logo_type=#{logoType} - and trans_type like concat('%', #{transType}, '%') + and from_country=#{fromCountry} + and country=#{country} + and apply_scope=#{applyScope} + and ( logo_type='-1' or logo_type=#{logoType} ) + and trans_type=#{transType} and order_num = #{orderNum} and remark like concat('%', #{remark}, '%') and tenant_id like concat('%', #{tenantId}, '%')