From b3c83924ba6ec084b9369b4dc56ded20e979291b Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 26 Sep 2019 09:58:23 +0800
Subject: [PATCH] - UploadImg4Vendors

---
 business/jxstore/initdata/initdata.go | 30 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/business/jxstore/initdata/initdata.go b/business/jxstore/initdata/initdata.go
index 600a70652..0d32fb2bc 100644
--- a/business/jxstore/initdata/initdata.go
+++ b/business/jxstore/initdata/initdata.go
@@ -342,10 +342,6 @@ func UploadEbaiImg4SkuName(ctx *jxcontext.Context, nameIDs []int, isAsync, isCon
 }
 
 func UploadImg4Vendors(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint string, err error) {
-	dataResList, err := dao.GetNeedUploadDataResource(dao.GetDB())
-	if err != nil {
-		return "", err
-	}
 	db := dao.GetDB()
 	rootTask := tasksch.NewSeqTask("UploadImg4Vendors", ctx,
 		func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
@@ -396,20 +392,26 @@ func UploadImg4Vendors(ctx *jxcontext.Context, isAsync, isContinueWhenError bool
 				WHERE t1.img <> '' AND t2.id IS NULL;
 				`)
 			case 2:
-				uploadTask := tasksch.NewParallelTask("UploadImg4Vendors",
-					tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError).SetParallelCount(5), ctx,
-					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-						dataRes := batchItemList[0].(*model.DataResource)
-						_, err = datares.UploadImage2Vendors(ctx, task, dataRes, nil, false)
-						return nil, err
-					}, dataResList)
-				tasksch.HandleTask(uploadTask, task, true).Run()
-				_, err = uploadTask.GetResult(0)
+				dataResList, err := dao.GetNeedUploadDataResource(db)
+				if err == nil && len(dataResList) > 0 {
+					uploadTask := tasksch.NewParallelTask("UploadImg4Vendors",
+						tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError).SetParallelCount(5), ctx,
+						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+							dataRes := batchItemList[0].(*model.DataResource)
+							_, err = datares.UploadImage2Vendors(ctx, task, dataRes, nil, false)
+							return nil, err
+						}, dataResList)
+					tasksch.HandleTask(uploadTask, task, true).Run()
+					_, err = uploadTask.GetResult(0)
+				}
 			}
 			return result, err
 		}, 3)
+	tasksch.HandleTask(rootTask, nil, true).Run()
 	if !isAsync {
-		_, err = rootTask.GetResult(0)
+		if _, err = rootTask.GetResult(0); err == nil {
+			hint = "1"
+		}
 	} else {
 		hint = rootTask.ID
 	}