|
@@ -2203,7 +2203,7 @@
|
|
AND OO.ORDER_TYPE = #{orderTypee}
|
|
AND OO.ORDER_TYPE = #{orderTypee}
|
|
</if>
|
|
</if>
|
|
<if test="orderTypee == 100">
|
|
<if test="orderTypee == 100">
|
|
- AND OO.ORDER_TYPE in (12, 13 ,14)
|
|
|
|
|
|
+ AND OO.ORDER_TYPE in (12, 13 ,14,19)
|
|
</if>
|
|
</if>
|
|
<if test="userId!=null">
|
|
<if test="userId!=null">
|
|
and ASO.INSERT_USERNAME=#{userId}
|
|
and ASO.INSERT_USERNAME=#{userId}
|
|
@@ -2402,7 +2402,7 @@
|
|
AND OO.ORDER_TYPE = #{orderTypee}
|
|
AND OO.ORDER_TYPE = #{orderTypee}
|
|
</if>
|
|
</if>
|
|
<if test="orderTypee == 100">
|
|
<if test="orderTypee == 100">
|
|
- AND OO.ORDER_TYPE in (12, 13 ,14)
|
|
|
|
|
|
+ AND OO.ORDER_TYPE in (12, 13 ,14,19)
|
|
</if>
|
|
</if>
|
|
<if test="userId!=null">
|
|
<if test="userId!=null">
|
|
and ASO.INSERT_USERNAME=#{userId}
|
|
and ASO.INSERT_USERNAME=#{userId}
|