|
@@ -837,7 +837,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="name != null">
|
|
<if test="name != null">
|
|
|
- and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
|
|
|
|
+ and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="orderNo != null">
|
|
<if test="orderNo != null">
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
@@ -871,7 +871,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="name != null">
|
|
<if test="name != null">
|
|
|
- and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
|
|
|
|
+ and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="depId != null">
|
|
<if test="depId != null">
|
|
|
and g.department_id= #{depId ,jdbcType=VARCHAR}
|
|
and g.department_id= #{depId ,jdbcType=VARCHAR}
|