Browse Source

Merge remote-tracking branch 'origin/dev' into test

anderx 7 years ago
parent
commit
46c14e8408
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1077,7 +1077,7 @@
   	</if>
   	<if test="specially == 4">
   	and a.process_status in (4,5,6)
-  	and a.order_status not in(3,5)
+  	and a.order_status not in(5,7)
   	</if>
   	<if test="specially == 5">
   	and c.department_id=(select department_id from admin where  id= #{aid,jdbcType=VARCHAR})