瀏覽代碼

Merge branch 'test' of jishutao/aft into prod

gitadmin 7 年之前
父節點
當前提交
333b2babc8
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

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

@@ -1169,9 +1169,12 @@
 		<if test="orderChannel != null">
 			and a.order_channel =#{orderChannel,jdbcType=INTEGER}
 		</if>
-		<if test="approval != null">
+		<if test="approval != null and approval !=4">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="approval ==4">
+			and a.approval != 0
+		</if>
 		<if test="buyerName != null and buyerName != ''">
 			and b.nickname like concat('%', #{buyerName},'%')
 		</if>