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) {