|
@@ -69,7 +69,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
<if test="isWeb != null and isWeb == true">
|
|
<if test="isWeb != null and isWeb == true">
|
|
|
- and a.status != 'WAIT'
|
|
|
|
|
|
|
+ and a.status not in ('WAIT','CANCEL')
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ex.orderBy == null or ex.orderBy ==''">
|
|
<if test="ex.orderBy == null or ex.orderBy ==''">
|
|
|
ORDER BY a.create_time DESC
|
|
ORDER BY a.create_time DESC
|