|
|
@@ -334,10 +334,8 @@
|
|
|
from
|
|
|
ins_orders io
|
|
|
<!--如果存在 公司查询则进行连表 -->
|
|
|
- <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
|
|
|
left JOIN
|
|
|
ins_area_company iac on iac.orderno = io.orderno
|
|
|
- </if>
|
|
|
<where>
|
|
|
<if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
|
|
|
and io.orderno = #{orderQueryVo.orderNo}
|
|
|
@@ -364,7 +362,10 @@
|
|
|
and iac.company_id = #{orderQueryVo.companyId}
|
|
|
</if>
|
|
|
<if test="orderQueryVo.product != null and orderQueryVo.product != ''">
|
|
|
- and iac.product = #{orderQueryVo.product}
|
|
|
+ and io.product = #{orderQueryVo.product}
|
|
|
+ </if>
|
|
|
+ <if test="orderQueryVo.productid != null and orderQueryVo.productid != ''">
|
|
|
+ and io.productid = #{orderQueryVo.productid}
|
|
|
</if>
|
|
|
|
|
|
<!--
|