Update work.go

pkg/service/cast/work.go

@@ -435,14 +435,10 @@ func Publish(ctx *gin.Context) {
 		return
 	}
 	newCtx := NewCtxWithUserInfo(ctx)
-	if err = PublishWork(newCtx, req); err != nil {
-		service.Error(ctx, err)
-		return
-	}
 	loginInfo := login.GetUserInfoFromC(ctx)
 	var extraBytes []byte
 	extraBytes, _ = json.Marshal(req)
-	service.CastProvider.UpsertTaskList(newCtx, &cast.UpsertTaskListReq{
+	_, err = service.CastProvider.UpsertTaskList(newCtx, &cast.UpsertTaskListReq{
 		Action:       "publishBatch1",
 		Url:          "",
 		Status:       1,
@@ -450,6 +446,15 @@ func Publish(ctx *gin.Context) {
 		OperatorName: loginInfo.Name,
 		ExtraData:    string(extraBytes),
 	})
+	if err != nil {
+		service.Error(ctx, err)
+		return
+	}
+	if err = PublishWork(newCtx, req); err != nil {
+		service.Error(ctx, err)
+		return
+	}
+
 	service.Success(ctx, req)
 	return
 }
@@ -863,15 +868,10 @@ func RePublish(ctx *gin.Context) {
 		service.Error(ctx, err)
 		return
 	}
-	fmt.Println(resp)
-	if err = PublishWork(newCtx, &cast.PublishReq{WorkUuids: resp.WorkUuids}); err != nil {
-		service.Error(ctx, err)
-		return
-	}
 	loginInfo := login.GetUserInfoFromC(ctx)
 	var extraBytes []byte
 	extraBytes, _ = json.Marshal(req)
-	service.CastProvider.UpsertTaskList(newCtx, &cast.UpsertTaskListReq{
+	_, err = service.CastProvider.UpsertTaskList(newCtx, &cast.UpsertTaskListReq{
 		Action:       "publishBatch2",
 		Url:          "",
 		Status:       1,
@@ -879,6 +879,16 @@ func RePublish(ctx *gin.Context) {
 		OperatorName: loginInfo.Name,
 		ExtraData:    string(extraBytes),
 	})
+	if err != nil {
+		zap.L().Error("RePublish UpsertTaskList failed", zap.Error(err))
+		service.Error(ctx, err)
+		return
+	}
+	if err = PublishWork(newCtx, &cast.PublishReq{WorkUuids: resp.WorkUuids}); err != nil {
+		service.Error(ctx, err)
+		return
+	}
+
 	service.Success(ctx, req)
 	return
 }