|
@@ -93,8 +93,8 @@
|
|
<if test="serviceId != null and serviceId != ''">
|
|
<if test="serviceId != null and serviceId != ''">
|
|
and tbs.id = #{serviceId}
|
|
and tbs.id = #{serviceId}
|
|
</if>
|
|
</if>
|
|
- <if test="region_id != null and region_id != ''">
|
|
|
|
- and r.id = #{region_id}
|
|
|
|
|
|
+ <if test="regionId != null and regionId != ''">
|
|
|
|
+ and r.id = #{regionId}
|
|
</if>
|
|
</if>
|
|
<if test="supplierId != null and supplierId != ''">
|
|
<if test="supplierId != null and supplierId != ''">
|
|
and us.supplier_id = #{supplierId}
|
|
and us.supplier_id = #{supplierId}
|