From 85da153440556effb8b38764e79bf72f2a15520c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 10 Nov 2020 14:06:33 +0800
Subject: [PATCH] getjddelivery

---
 business/jxstore/cms/job.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index a06380cea..0bde25ecf 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -765,9 +765,13 @@ func CancelJdDelivery(ctx *jxcontext.Context, vendorWaybillID, reason string) (e
 
 func GetJdDelivery(ctx *jxcontext.Context, status int, fromTime, toTime string, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
 	var (
-		db = dao.GetDB()
+		db      = dao.GetDB()
+		statuss []int
 	)
-	return dao.GetDeliveryOrders(db, []string{ctx.GetUserID()}, []int{status}, utils.Str2Time(fromTime), utils.Str2Time(toTime), pageSize, offset)
+	if status != 0 {
+		statuss = append(statuss, status)
+	}
+	return dao.GetDeliveryOrders(db, []string{ctx.GetUserID()}, statuss, utils.Str2Time(fromTime), utils.Str2Time(toTime), pageSize, offset)
 }
 
 func GetJdDeliveryDetail(ctx *jxcontext.Context, vendorWaybillID string) (queryDynamicTraceInfo []*jdeclpapi.QueryDynamicTraceInfoResult, err error) {