|
|
@@ -1187,7 +1187,7 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 3">
|
|
|
- and a.approval = 1 and a.order_status=2
|
|
|
+ and a.approval = 1 and a.order_status=2 and a.process_status != 99
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
and e.main=1
|
|
|
@@ -1273,7 +1273,7 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 3">
|
|
|
- and a.approval = 1 and a.order_status=2
|
|
|
+ and a.approval = 1 and a.order_status=2 and a.process_status != 99
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
and e.main=1
|