You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2022/06/29 06:46:17 UTC

[incubator-devlake] branch main updated: fix: some bug when first collect

This is an automated email from the ASF dual-hosted git repository.

abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new 7a810d67 fix: some bug when first collect
7a810d67 is described below

commit 7a810d674d1fbd462da0d674fa9bf460d2322db6
Author: linyh <ya...@meri.co>
AuthorDate: Tue Jun 28 22:11:26 2022 +0800

    fix: some bug when first collect
---
 plugins/core/dal/dal.go                             |  3 ---
 plugins/tapd/tasks/bug_changelog_collector.go       |  2 +-
 plugins/tapd/tasks/bug_changelog_converter.go       |  2 +-
 plugins/tapd/tasks/bug_changelog_extractor.go       |  2 +-
 plugins/tapd/tasks/bug_collector.go                 |  2 +-
 plugins/tapd/tasks/bug_commit_collector.go          |  2 +-
 plugins/tapd/tasks/bug_commit_converter.go          |  2 +-
 plugins/tapd/tasks/bug_commit_extractor.go          |  2 +-
 plugins/tapd/tasks/bug_converter.go                 |  2 +-
 plugins/tapd/tasks/bug_custom_fields_collector.go   |  2 +-
 plugins/tapd/tasks/bug_custom_fields_extractor.go   |  2 +-
 plugins/tapd/tasks/bug_extractor.go                 |  2 +-
 plugins/tapd/tasks/bug_label_convertor.go           |  2 +-
 plugins/tapd/tasks/bug_status_collector.go          |  2 +-
 plugins/tapd/tasks/bug_status_extractor.go          |  2 +-
 plugins/tapd/tasks/company_collector.go             |  2 +-
 plugins/tapd/tasks/company_extractor.go             |  2 +-
 plugins/tapd/tasks/iteration_collector.go           |  2 +-
 plugins/tapd/tasks/iteration_converter.go           |  2 +-
 plugins/tapd/tasks/iteration_extractor.go           |  2 +-
 plugins/tapd/tasks/shared.go                        | 11 ++++++++---
 plugins/tapd/tasks/story_bug_collector.go           |  2 +-
 plugins/tapd/tasks/story_bug_extractor.go           |  2 +-
 plugins/tapd/tasks/story_category_collector.go      |  2 +-
 plugins/tapd/tasks/story_category_extractor.go      |  2 +-
 plugins/tapd/tasks/story_changelog_collector.go     |  2 +-
 plugins/tapd/tasks/story_changelog_converter.go     |  2 +-
 plugins/tapd/tasks/story_changelog_extractor.go     |  2 +-
 plugins/tapd/tasks/story_collector.go               |  2 +-
 plugins/tapd/tasks/story_commit_collector.go        |  2 +-
 plugins/tapd/tasks/story_commit_converter.go        |  2 +-
 plugins/tapd/tasks/story_commit_extractor.go        |  2 +-
 plugins/tapd/tasks/story_converter.go               |  2 +-
 plugins/tapd/tasks/story_custom_fields_collector.go |  2 +-
 plugins/tapd/tasks/story_custom_fields_extractor.go |  2 +-
 plugins/tapd/tasks/story_extractor.go               |  2 +-
 plugins/tapd/tasks/story_label_convertor.go         |  2 +-
 plugins/tapd/tasks/story_status_collector.go        |  2 +-
 plugins/tapd/tasks/story_status_extractor.go        |  2 +-
 plugins/tapd/tasks/sub_workspace_collector.go       |  2 +-
 plugins/tapd/tasks/sub_workspace_converter.go       |  2 +-
 plugins/tapd/tasks/sub_workspace_extractor.go       |  2 +-
 plugins/tapd/tasks/task_changelog_collector.go      |  2 +-
 plugins/tapd/tasks/task_changelog_converter.go      |  2 +-
 plugins/tapd/tasks/task_changelog_extractor.go      |  2 +-
 plugins/tapd/tasks/task_collector.go                |  2 +-
 plugins/tapd/tasks/task_commit_collector.go         |  2 +-
 plugins/tapd/tasks/task_commit_converter.go         |  2 +-
 plugins/tapd/tasks/task_commit_extractor.go         |  2 +-
 plugins/tapd/tasks/task_converter.go                |  2 +-
 plugins/tapd/tasks/task_custom_fields_collector.go  |  2 +-
 plugins/tapd/tasks/task_custom_fields_extractor.go  |  2 +-
 plugins/tapd/tasks/task_extractor.go                |  2 +-
 plugins/tapd/tasks/task_label_convertor.go          |  2 +-
 plugins/tapd/tasks/user_collector.go                |  2 +-
 plugins/tapd/tasks/user_converter.go                |  2 +-
 plugins/tapd/tasks/user_extractor.go                |  2 +-
 plugins/tapd/tasks/worklog_collector.go             |  2 +-
 plugins/tapd/tasks/worklog_converter.go             |  2 +-
 plugins/tapd/tasks/worklog_extractor.go             |  2 +-
 60 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/plugins/core/dal/dal.go b/plugins/core/dal/dal.go
index 90be4760..a8790860 100644
--- a/plugins/core/dal/dal.go
+++ b/plugins/core/dal/dal.go
@@ -19,7 +19,6 @@ package dal
 
 import (
 	"database/sql"
-	"errors"
 )
 
 type Clause struct {
@@ -130,5 +129,3 @@ const HavingClause string = "Having"
 func Having(clause string, params ...interface{}) Clause {
 	return Clause{Type: HavingClause, Data: DalClause{clause, params}}
 }
-
-var ErrRecordNotFound = errors.New("record not found")
diff --git a/plugins/tapd/tasks/bug_changelog_collector.go b/plugins/tapd/tasks/bug_changelog_collector.go
index 62dc7721..948daa2d 100644
--- a/plugins/tapd/tasks/bug_changelog_collector.go
+++ b/plugins/tapd/tasks/bug_changelog_collector.go
@@ -34,7 +34,7 @@ const RAW_BUG_CHANGELOG_TABLE = "tapd_api_bug_changelogs"
 var _ core.SubTaskEntryPoint = CollectBugChangelogs
 
 func CollectBugChangelogs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect storyChangelogs")
diff --git a/plugins/tapd/tasks/bug_changelog_converter.go b/plugins/tapd/tasks/bug_changelog_converter.go
index 3b07480c..cc15e986 100644
--- a/plugins/tapd/tasks/bug_changelog_converter.go
+++ b/plugins/tapd/tasks/bug_changelog_converter.go
@@ -52,7 +52,7 @@ type BugChangelogItemResult struct {
 }
 
 func ConvertBugChangelog(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert changelog :%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/bug_changelog_extractor.go b/plugins/tapd/tasks/bug_changelog_extractor.go
index 7728d173..3223be87 100644
--- a/plugins/tapd/tasks/bug_changelog_extractor.go
+++ b/plugins/tapd/tasks/bug_changelog_extractor.go
@@ -35,7 +35,7 @@ var ExtractBugChangelogMeta = core.SubTaskMeta{
 }
 
 func ExtractBugChangelog(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CHANGELOG_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/bug_collector.go b/plugins/tapd/tasks/bug_collector.go
index 3e6f5c3a..0b0d7620 100644
--- a/plugins/tapd/tasks/bug_collector.go
+++ b/plugins/tapd/tasks/bug_collector.go
@@ -34,7 +34,7 @@ const RAW_BUG_TABLE = "tapd_api_bugs"
 var _ core.SubTaskEntryPoint = CollectBugs
 
 func CollectBugs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect bugs")
diff --git a/plugins/tapd/tasks/bug_commit_collector.go b/plugins/tapd/tasks/bug_commit_collector.go
index 7646bc9f..e59e9c1d 100644
--- a/plugins/tapd/tasks/bug_commit_collector.go
+++ b/plugins/tapd/tasks/bug_commit_collector.go
@@ -41,7 +41,7 @@ type SimpleBug struct {
 }
 
 func CollectBugCommits(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_COMMIT_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect issueCommits")
diff --git a/plugins/tapd/tasks/bug_commit_converter.go b/plugins/tapd/tasks/bug_commit_converter.go
index 514ad08f..0ed30e91 100644
--- a/plugins/tapd/tasks/bug_commit_converter.go
+++ b/plugins/tapd/tasks/bug_commit_converter.go
@@ -29,7 +29,7 @@ import (
 )
 
 func ConvertBugCommit(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_COMMIT_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/bug_commit_extractor.go b/plugins/tapd/tasks/bug_commit_extractor.go
index b2250941..3cc962b2 100644
--- a/plugins/tapd/tasks/bug_commit_extractor.go
+++ b/plugins/tapd/tasks/bug_commit_extractor.go
@@ -35,7 +35,7 @@ var ExtractBugCommitMeta = core.SubTaskMeta{
 }
 
 func ExtractBugCommits(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_COMMIT_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/bug_converter.go b/plugins/tapd/tasks/bug_converter.go
index b075d607..085cbc3c 100644
--- a/plugins/tapd/tasks/bug_converter.go
+++ b/plugins/tapd/tasks/bug_converter.go
@@ -32,7 +32,7 @@ import (
 )
 
 func ConvertBug(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/bug_custom_fields_collector.go b/plugins/tapd/tasks/bug_custom_fields_collector.go
index df1136e0..c5e2ec97 100644
--- a/plugins/tapd/tasks/bug_custom_fields_collector.go
+++ b/plugins/tapd/tasks/bug_custom_fields_collector.go
@@ -32,7 +32,7 @@ const RAW_BUG_CUSTOM_FIELDS_TABLE = "tapd_api_bug_custom_fields"
 var _ core.SubTaskEntryPoint = CollectBugCustomFields
 
 func CollectBugCustomFields(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CUSTOM_FIELDS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CUSTOM_FIELDS_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect bug_custom_fields")
 	collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
diff --git a/plugins/tapd/tasks/bug_custom_fields_extractor.go b/plugins/tapd/tasks/bug_custom_fields_extractor.go
index cc785ade..221748db 100644
--- a/plugins/tapd/tasks/bug_custom_fields_extractor.go
+++ b/plugins/tapd/tasks/bug_custom_fields_extractor.go
@@ -35,7 +35,7 @@ var ExtractBugCustomFieldsMeta = core.SubTaskMeta{
 }
 
 func ExtractBugCustomFields(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CUSTOM_FIELDS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_CUSTOM_FIELDS_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/bug_extractor.go b/plugins/tapd/tasks/bug_extractor.go
index 7f69e4b9..90d12f5b 100644
--- a/plugins/tapd/tasks/bug_extractor.go
+++ b/plugins/tapd/tasks/bug_extractor.go
@@ -39,7 +39,7 @@ var ExtractBugMeta = core.SubTaskMeta{
 }
 
 func ExtractBugs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE, false)
 	db := taskCtx.GetDal()
 	statusList := make([]*models.TapdBugStatus, 0)
 	clauses := []dal.Clause{
diff --git a/plugins/tapd/tasks/bug_label_convertor.go b/plugins/tapd/tasks/bug_label_convertor.go
index 6c43069f..671cd4d7 100644
--- a/plugins/tapd/tasks/bug_label_convertor.go
+++ b/plugins/tapd/tasks/bug_label_convertor.go
@@ -37,7 +37,7 @@ var ConvertBugLabelsMeta = core.SubTaskMeta{
 
 func ConvertBugLabels(taskCtx core.SubTaskContext) error {
 	db := taskCtx.GetDal()
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_TABLE, false)
 	clauses := []dal.Clause{
 		dal.From(&models.TapdBugLabel{}),
 		dal.Join("left join _tool_tapd_workspace_bugs on _tool_tapd_workspace_bugs.bug_id = _tool_tapd_bug_labels.bug_id"),
diff --git a/plugins/tapd/tasks/bug_status_collector.go b/plugins/tapd/tasks/bug_status_collector.go
index 178b8e4f..4af7b699 100644
--- a/plugins/tapd/tasks/bug_status_collector.go
+++ b/plugins/tapd/tasks/bug_status_collector.go
@@ -30,7 +30,7 @@ const RAW_BUG_STATUS_TABLE = "tapd_api_bug_status"
 var _ core.SubTaskEntryPoint = CollectBugStatus
 
 func CollectBugStatus(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_STATUS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_STATUS_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect bugStatus")
 
diff --git a/plugins/tapd/tasks/bug_status_extractor.go b/plugins/tapd/tasks/bug_status_extractor.go
index 4532a15f..1e3bc115 100644
--- a/plugins/tapd/tasks/bug_status_extractor.go
+++ b/plugins/tapd/tasks/bug_status_extractor.go
@@ -35,7 +35,7 @@ var ExtractBugStatusMeta = core.SubTaskMeta{
 }
 
 func ExtractBugStatus(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_STATUS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_BUG_STATUS_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/company_collector.go b/plugins/tapd/tasks/company_collector.go
index 598eb33b..445df975 100644
--- a/plugins/tapd/tasks/company_collector.go
+++ b/plugins/tapd/tasks/company_collector.go
@@ -32,7 +32,7 @@ const RAW_COMPANY_TABLE = "tapd_api_companies"
 var _ core.SubTaskEntryPoint = CollectCompanies
 
 func CollectCompanies(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_COMPANY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_COMPANY_TABLE, true)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect companies")
 	collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
diff --git a/plugins/tapd/tasks/company_extractor.go b/plugins/tapd/tasks/company_extractor.go
index 5b748983..2c81904d 100644
--- a/plugins/tapd/tasks/company_extractor.go
+++ b/plugins/tapd/tasks/company_extractor.go
@@ -35,7 +35,7 @@ var ExtractCompanyMeta = core.SubTaskMeta{
 }
 
 func ExtractCompanies(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_COMPANY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_COMPANY_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/iteration_collector.go b/plugins/tapd/tasks/iteration_collector.go
index 0c636a4b..e6598671 100644
--- a/plugins/tapd/tasks/iteration_collector.go
+++ b/plugins/tapd/tasks/iteration_collector.go
@@ -36,7 +36,7 @@ const RAW_ITERATION_TABLE = "tapd_api_iterations"
 var _ core.SubTaskEntryPoint = CollectIterations
 
 func CollectIterations(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_ITERATION_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_ITERATION_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect iterations")
diff --git a/plugins/tapd/tasks/iteration_converter.go b/plugins/tapd/tasks/iteration_converter.go
index d4141d16..00ced5ff 100644
--- a/plugins/tapd/tasks/iteration_converter.go
+++ b/plugins/tapd/tasks/iteration_converter.go
@@ -33,7 +33,7 @@ import (
 )
 
 func ConvertIteration(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_ITERATION_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_ITERATION_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("collect board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/iteration_extractor.go b/plugins/tapd/tasks/iteration_extractor.go
index 54a0db90..afaa009d 100644
--- a/plugins/tapd/tasks/iteration_extractor.go
+++ b/plugins/tapd/tasks/iteration_extractor.go
@@ -35,7 +35,7 @@ var ExtractIterationMeta = core.SubTaskMeta{
 }
 
 func ExtractIterations(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_ITERATION_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_ITERATION_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/shared.go b/plugins/tapd/tasks/shared.go
index 3201dca7..9ec0240d 100644
--- a/plugins/tapd/tasks/shared.go
+++ b/plugins/tapd/tasks/shared.go
@@ -115,19 +115,24 @@ type TapdApiParams struct {
 	WorkspaceId  uint64
 }
 
-func CreateRawDataSubTaskArgs(taskCtx core.SubTaskContext, rawTable string) (*helper.RawDataSubTaskArgs, *TapdTaskData) {
+func CreateRawDataSubTaskArgs(taskCtx core.SubTaskContext, rawTable string, useCompanyId bool) (*helper.RawDataSubTaskArgs, *TapdTaskData) {
 	data := taskCtx.GetData().(*TapdTaskData)
+	filteredData := *data
+	filteredData.Options = &TapdOptions{}
+	*filteredData.Options = *data.Options
 	var params = TapdApiParams{
 		ConnectionId: data.Options.ConnectionId,
 		WorkspaceId:  data.Options.WorkspaceId,
 	}
-	if data.Options.CompanyId != 0 {
+	if data.Options.CompanyId != 0 && useCompanyId {
 		params.CompanyId = data.Options.CompanyId
+	} else {
+		filteredData.Options.CompanyId = 0
 	}
 	RawDataSubTaskArgs := &helper.RawDataSubTaskArgs{
 		Ctx:    taskCtx,
 		Params: params,
 		Table:  rawTable,
 	}
-	return RawDataSubTaskArgs, data
+	return RawDataSubTaskArgs, &filteredData
 }
diff --git a/plugins/tapd/tasks/story_bug_collector.go b/plugins/tapd/tasks/story_bug_collector.go
index e60f780d..3306ee23 100644
--- a/plugins/tapd/tasks/story_bug_collector.go
+++ b/plugins/tapd/tasks/story_bug_collector.go
@@ -33,7 +33,7 @@ const RAW_STORY_BUG_TABLE = "tapd_api_story_bugs"
 var _ core.SubTaskEntryPoint = CollectStoryBugs
 
 func CollectStoryBugs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_BUG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_BUG_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect storyBugs")
diff --git a/plugins/tapd/tasks/story_bug_extractor.go b/plugins/tapd/tasks/story_bug_extractor.go
index 338c74d4..559592af 100644
--- a/plugins/tapd/tasks/story_bug_extractor.go
+++ b/plugins/tapd/tasks/story_bug_extractor.go
@@ -35,7 +35,7 @@ var ExtractStoryBugsMeta = core.SubTaskMeta{
 }
 
 func ExtractStoryBugs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_BUG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_BUG_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/story_category_collector.go b/plugins/tapd/tasks/story_category_collector.go
index 4ff75d2d..6260f62e 100644
--- a/plugins/tapd/tasks/story_category_collector.go
+++ b/plugins/tapd/tasks/story_category_collector.go
@@ -32,7 +32,7 @@ const RAW_STORY_CATEGORY_TABLE = "tapd_api_story_categories"
 var _ core.SubTaskEntryPoint = CollectStoryCategories
 
 func CollectStoryCategories(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CATEGORY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CATEGORY_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect story_category")
 	collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
diff --git a/plugins/tapd/tasks/story_category_extractor.go b/plugins/tapd/tasks/story_category_extractor.go
index ff3887b4..0b641855 100644
--- a/plugins/tapd/tasks/story_category_extractor.go
+++ b/plugins/tapd/tasks/story_category_extractor.go
@@ -35,7 +35,7 @@ var ExtractStoryCategoriesMeta = core.SubTaskMeta{
 }
 
 func ExtractStoryCategories(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CATEGORY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CATEGORY_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/story_changelog_collector.go b/plugins/tapd/tasks/story_changelog_collector.go
index 738786ce..5639bb87 100644
--- a/plugins/tapd/tasks/story_changelog_collector.go
+++ b/plugins/tapd/tasks/story_changelog_collector.go
@@ -33,7 +33,7 @@ const RAW_STORY_CHANGELOG_TABLE = "tapd_api_story_changelogs"
 var _ core.SubTaskEntryPoint = CollectStoryChangelogs
 
 func CollectStoryChangelogs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect storyChangelogs")
diff --git a/plugins/tapd/tasks/story_changelog_converter.go b/plugins/tapd/tasks/story_changelog_converter.go
index f6f25cf3..4329ce46 100644
--- a/plugins/tapd/tasks/story_changelog_converter.go
+++ b/plugins/tapd/tasks/story_changelog_converter.go
@@ -55,7 +55,7 @@ type StoryChangelogItemResult struct {
 }
 
 func ConvertStoryChangelog(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert changelog :%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/story_changelog_extractor.go b/plugins/tapd/tasks/story_changelog_extractor.go
index 76ab724d..b8648441 100644
--- a/plugins/tapd/tasks/story_changelog_extractor.go
+++ b/plugins/tapd/tasks/story_changelog_extractor.go
@@ -36,7 +36,7 @@ var ExtractStoryChangelogMeta = core.SubTaskMeta{
 }
 
 func ExtractStoryChangelog(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CHANGELOG_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/story_collector.go b/plugins/tapd/tasks/story_collector.go
index c82414fb..a29975eb 100644
--- a/plugins/tapd/tasks/story_collector.go
+++ b/plugins/tapd/tasks/story_collector.go
@@ -34,7 +34,7 @@ const RAW_STORY_TABLE = "tapd_api_stories"
 var _ core.SubTaskEntryPoint = CollectStorys
 
 func CollectStorys(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect stories")
diff --git a/plugins/tapd/tasks/story_commit_collector.go b/plugins/tapd/tasks/story_commit_collector.go
index 542e0ba6..18dd0a53 100644
--- a/plugins/tapd/tasks/story_commit_collector.go
+++ b/plugins/tapd/tasks/story_commit_collector.go
@@ -41,7 +41,7 @@ type SimpleStory struct {
 }
 
 func CollectStoryCommits(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_COMMIT_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect issueCommits")
diff --git a/plugins/tapd/tasks/story_commit_converter.go b/plugins/tapd/tasks/story_commit_converter.go
index bf345c19..39139e13 100644
--- a/plugins/tapd/tasks/story_commit_converter.go
+++ b/plugins/tapd/tasks/story_commit_converter.go
@@ -29,7 +29,7 @@ import (
 )
 
 func ConvertStoryCommit(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_COMMIT_TABLE, false)
 	db := taskCtx.GetDal()
 	clauses := []dal.Clause{
 		dal.From(&models.TapdStoryCommit{}),
diff --git a/plugins/tapd/tasks/story_commit_extractor.go b/plugins/tapd/tasks/story_commit_extractor.go
index d5351dad..9970a74b 100644
--- a/plugins/tapd/tasks/story_commit_extractor.go
+++ b/plugins/tapd/tasks/story_commit_extractor.go
@@ -35,7 +35,7 @@ var ExtractStoryCommitMeta = core.SubTaskMeta{
 }
 
 func ExtractStoryCommits(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_COMMIT_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/story_converter.go b/plugins/tapd/tasks/story_converter.go
index 0b11ac17..eb89a38c 100644
--- a/plugins/tapd/tasks/story_converter.go
+++ b/plugins/tapd/tasks/story_converter.go
@@ -33,7 +33,7 @@ import (
 )
 
 func ConvertStory(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/story_custom_fields_collector.go b/plugins/tapd/tasks/story_custom_fields_collector.go
index d6dca4d4..0fd12e9c 100644
--- a/plugins/tapd/tasks/story_custom_fields_collector.go
+++ b/plugins/tapd/tasks/story_custom_fields_collector.go
@@ -32,7 +32,7 @@ const RAW_STORY_CUSTOM_FIELDS_TABLE = "tapd_api_story_custom_fields"
 var _ core.SubTaskEntryPoint = CollectStoryCustomFields
 
 func CollectStoryCustomFields(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CUSTOM_FIELDS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CUSTOM_FIELDS_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect story_custom_fields")
 	collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
diff --git a/plugins/tapd/tasks/story_custom_fields_extractor.go b/plugins/tapd/tasks/story_custom_fields_extractor.go
index df8e56e1..48f70f14 100644
--- a/plugins/tapd/tasks/story_custom_fields_extractor.go
+++ b/plugins/tapd/tasks/story_custom_fields_extractor.go
@@ -35,7 +35,7 @@ var ExtractStoryCustomFieldsMeta = core.SubTaskMeta{
 }
 
 func ExtractStoryCustomFields(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CUSTOM_FIELDS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_CUSTOM_FIELDS_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/story_extractor.go b/plugins/tapd/tasks/story_extractor.go
index af254ba7..4cd33e8b 100644
--- a/plugins/tapd/tasks/story_extractor.go
+++ b/plugins/tapd/tasks/story_extractor.go
@@ -39,7 +39,7 @@ var ExtractStoryMeta = core.SubTaskMeta{
 }
 
 func ExtractStories(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE, false)
 	db := taskCtx.GetDal()
 	statusList := make([]*models.TapdStoryStatus, 0)
 	clauses := []dal.Clause{
diff --git a/plugins/tapd/tasks/story_label_convertor.go b/plugins/tapd/tasks/story_label_convertor.go
index b02076e9..55e382d7 100644
--- a/plugins/tapd/tasks/story_label_convertor.go
+++ b/plugins/tapd/tasks/story_label_convertor.go
@@ -37,7 +37,7 @@ var ConvertStoryLabelsMeta = core.SubTaskMeta{
 
 func ConvertStoryLabels(taskCtx core.SubTaskContext) error {
 	db := taskCtx.GetDal()
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_TABLE, false)
 
 	clauses := []dal.Clause{
 		dal.From(&models.TapdStoryLabel{}),
diff --git a/plugins/tapd/tasks/story_status_collector.go b/plugins/tapd/tasks/story_status_collector.go
index 8be720ef..49677d6e 100644
--- a/plugins/tapd/tasks/story_status_collector.go
+++ b/plugins/tapd/tasks/story_status_collector.go
@@ -30,7 +30,7 @@ const RAW_STORY_STATUS_TABLE = "tapd_api_story_status"
 var _ core.SubTaskEntryPoint = CollectStoryStatus
 
 func CollectStoryStatus(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_STATUS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_STATUS_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect bugStatus")
 
diff --git a/plugins/tapd/tasks/story_status_extractor.go b/plugins/tapd/tasks/story_status_extractor.go
index 6d969980..026c23b6 100644
--- a/plugins/tapd/tasks/story_status_extractor.go
+++ b/plugins/tapd/tasks/story_status_extractor.go
@@ -35,7 +35,7 @@ var ExtractStoryStatusMeta = core.SubTaskMeta{
 }
 
 func ExtractStoryStatus(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_STATUS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_STORY_STATUS_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/sub_workspace_collector.go b/plugins/tapd/tasks/sub_workspace_collector.go
index a7e2988b..fe44bb1e 100644
--- a/plugins/tapd/tasks/sub_workspace_collector.go
+++ b/plugins/tapd/tasks/sub_workspace_collector.go
@@ -32,7 +32,7 @@ const RAW_SUB_WORKSPACE_TABLE = "tapd_api_sub_workspaces"
 var _ core.SubTaskEntryPoint = CollectSubWorkspaces
 
 func CollectSubWorkspaces(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_SUB_WORKSPACE_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_SUB_WORKSPACE_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect workspaces")
 	collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
diff --git a/plugins/tapd/tasks/sub_workspace_converter.go b/plugins/tapd/tasks/sub_workspace_converter.go
index 36419a27..b8846119 100644
--- a/plugins/tapd/tasks/sub_workspace_converter.go
+++ b/plugins/tapd/tasks/sub_workspace_converter.go
@@ -29,7 +29,7 @@ import (
 )
 
 func ConvertSubWorkspace(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_SUB_WORKSPACE_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_SUB_WORKSPACE_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("collect board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/sub_workspace_extractor.go b/plugins/tapd/tasks/sub_workspace_extractor.go
index 56cc3ad6..036b5d98 100644
--- a/plugins/tapd/tasks/sub_workspace_extractor.go
+++ b/plugins/tapd/tasks/sub_workspace_extractor.go
@@ -35,7 +35,7 @@ var ExtractSubWorkspaceMeta = core.SubTaskMeta{
 }
 
 func ExtractSubWorkspaces(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_SUB_WORKSPACE_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_SUB_WORKSPACE_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/task_changelog_collector.go b/plugins/tapd/tasks/task_changelog_collector.go
index a573672c..251f31f4 100644
--- a/plugins/tapd/tasks/task_changelog_collector.go
+++ b/plugins/tapd/tasks/task_changelog_collector.go
@@ -34,7 +34,7 @@ const RAW_TASK_CHANGELOG_TABLE = "tapd_api_task_changelogs"
 var _ core.SubTaskEntryPoint = CollectTaskChangelogs
 
 func CollectTaskChangelogs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect taskChangelogs")
diff --git a/plugins/tapd/tasks/task_changelog_converter.go b/plugins/tapd/tasks/task_changelog_converter.go
index 24b351aa..4dcd00cb 100644
--- a/plugins/tapd/tasks/task_changelog_converter.go
+++ b/plugins/tapd/tasks/task_changelog_converter.go
@@ -56,7 +56,7 @@ type TaskChangelogItemResult struct {
 }
 
 func ConvertTaskChangelog(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert changelog :%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/task_changelog_extractor.go b/plugins/tapd/tasks/task_changelog_extractor.go
index 89de1b5c..801e33cd 100644
--- a/plugins/tapd/tasks/task_changelog_extractor.go
+++ b/plugins/tapd/tasks/task_changelog_extractor.go
@@ -36,7 +36,7 @@ var ExtractTaskChangelogMeta = core.SubTaskMeta{
 }
 
 func ExtractTaskChangelog(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CHANGELOG_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/task_collector.go b/plugins/tapd/tasks/task_collector.go
index 99e002a4..b9b272c2 100644
--- a/plugins/tapd/tasks/task_collector.go
+++ b/plugins/tapd/tasks/task_collector.go
@@ -34,7 +34,7 @@ const RAW_TASK_TABLE = "tapd_api_tasks"
 var _ core.SubTaskEntryPoint = CollectTasks
 
 func CollectTasks(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE, false)
 	db := taskCtx.GetDal()
 
 	logger := taskCtx.GetLogger()
diff --git a/plugins/tapd/tasks/task_commit_collector.go b/plugins/tapd/tasks/task_commit_collector.go
index dbf72377..74e4e521 100644
--- a/plugins/tapd/tasks/task_commit_collector.go
+++ b/plugins/tapd/tasks/task_commit_collector.go
@@ -41,7 +41,7 @@ type SimpleTask struct {
 }
 
 func CollectTaskCommits(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_COMMIT_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect issueCommits")
diff --git a/plugins/tapd/tasks/task_commit_converter.go b/plugins/tapd/tasks/task_commit_converter.go
index 7444ff0f..26aa1fa9 100644
--- a/plugins/tapd/tasks/task_commit_converter.go
+++ b/plugins/tapd/tasks/task_commit_converter.go
@@ -29,7 +29,7 @@ import (
 )
 
 func ConvertTaskCommit(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_COMMIT_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/task_commit_extractor.go b/plugins/tapd/tasks/task_commit_extractor.go
index da68d4ad..5075d8e6 100644
--- a/plugins/tapd/tasks/task_commit_extractor.go
+++ b/plugins/tapd/tasks/task_commit_extractor.go
@@ -35,7 +35,7 @@ var ExtractTaskCommitMeta = core.SubTaskMeta{
 }
 
 func ExtractTaskCommits(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_COMMIT_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_COMMIT_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/task_converter.go b/plugins/tapd/tasks/task_converter.go
index a0e8b27a..bfb19f7d 100644
--- a/plugins/tapd/tasks/task_converter.go
+++ b/plugins/tapd/tasks/task_converter.go
@@ -33,7 +33,7 @@ import (
 )
 
 func ConvertTask(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/task_custom_fields_collector.go b/plugins/tapd/tasks/task_custom_fields_collector.go
index b60a0be4..e48f8917 100644
--- a/plugins/tapd/tasks/task_custom_fields_collector.go
+++ b/plugins/tapd/tasks/task_custom_fields_collector.go
@@ -32,7 +32,7 @@ const RAW_TASK_CUSTOM_FIELDS_TABLE = "tapd_api_task_custom_fields"
 var _ core.SubTaskEntryPoint = CollectTaskCustomFields
 
 func CollectTaskCustomFields(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CUSTOM_FIELDS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CUSTOM_FIELDS_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect task_custom_fields")
 	collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
diff --git a/plugins/tapd/tasks/task_custom_fields_extractor.go b/plugins/tapd/tasks/task_custom_fields_extractor.go
index 705bf9ba..0be56be7 100644
--- a/plugins/tapd/tasks/task_custom_fields_extractor.go
+++ b/plugins/tapd/tasks/task_custom_fields_extractor.go
@@ -35,7 +35,7 @@ var ExtractTaskCustomFieldsMeta = core.SubTaskMeta{
 }
 
 func ExtractTaskCustomFields(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CUSTOM_FIELDS_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_CUSTOM_FIELDS_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/task_extractor.go b/plugins/tapd/tasks/task_extractor.go
index 4dbb371d..ea3b3289 100644
--- a/plugins/tapd/tasks/task_extractor.go
+++ b/plugins/tapd/tasks/task_extractor.go
@@ -38,7 +38,7 @@ var ExtractTaskMeta = core.SubTaskMeta{
 }
 
 func ExtractTasks(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE, false)
 	getStdStatus := func(statusKey string) string {
 		if statusKey == "done" {
 			return ticket.DONE
diff --git a/plugins/tapd/tasks/task_label_convertor.go b/plugins/tapd/tasks/task_label_convertor.go
index 043b543b..56af42c3 100644
--- a/plugins/tapd/tasks/task_label_convertor.go
+++ b/plugins/tapd/tasks/task_label_convertor.go
@@ -37,7 +37,7 @@ var ConvertTaskLabelsMeta = core.SubTaskMeta{
 
 func ConvertTaskLabels(taskCtx core.SubTaskContext) error {
 	db := taskCtx.GetDal()
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_TASK_TABLE, false)
 
 	clauses := []dal.Clause{
 		dal.From(&models.TapdTaskLabel{}),
diff --git a/plugins/tapd/tasks/user_collector.go b/plugins/tapd/tasks/user_collector.go
index 11d668e0..81b4bc76 100644
--- a/plugins/tapd/tasks/user_collector.go
+++ b/plugins/tapd/tasks/user_collector.go
@@ -32,7 +32,7 @@ const RAW_USER_TABLE = "tapd_api_users"
 var _ core.SubTaskEntryPoint = CollectUsers
 
 func CollectUsers(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE, false)
 	logger := taskCtx.GetLogger()
 	logger.Info("collect users")
 	collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
diff --git a/plugins/tapd/tasks/user_converter.go b/plugins/tapd/tasks/user_converter.go
index d309313f..c9877100 100644
--- a/plugins/tapd/tasks/user_converter.go
+++ b/plugins/tapd/tasks/user_converter.go
@@ -30,7 +30,7 @@ import (
 )
 
 func ConvertUser(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/user_extractor.go b/plugins/tapd/tasks/user_extractor.go
index 5d52d8be..1d3fa77e 100644
--- a/plugins/tapd/tasks/user_extractor.go
+++ b/plugins/tapd/tasks/user_extractor.go
@@ -35,7 +35,7 @@ var ExtractUserMeta = core.SubTaskMeta{
 }
 
 func ExtractUsers(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {
diff --git a/plugins/tapd/tasks/worklog_collector.go b/plugins/tapd/tasks/worklog_collector.go
index ec95dfb2..13e3531a 100644
--- a/plugins/tapd/tasks/worklog_collector.go
+++ b/plugins/tapd/tasks/worklog_collector.go
@@ -34,7 +34,7 @@ const RAW_WORKLOG_TABLE = "tapd_api_worklogs"
 var _ core.SubTaskEntryPoint = CollectWorklogs
 
 func CollectWorklogs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_WORKLOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_WORKLOG_TABLE, false)
 	db := taskCtx.GetDal()
 	logger := taskCtx.GetLogger()
 	logger.Info("collect worklogs")
diff --git a/plugins/tapd/tasks/worklog_converter.go b/plugins/tapd/tasks/worklog_converter.go
index 1a797518..c8adf0b0 100644
--- a/plugins/tapd/tasks/worklog_converter.go
+++ b/plugins/tapd/tasks/worklog_converter.go
@@ -31,7 +31,7 @@ import (
 )
 
 func ConvertWorklog(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_WORKLOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_WORKLOG_TABLE, false)
 	logger := taskCtx.GetLogger()
 	db := taskCtx.GetDal()
 	logger.Info("convert board:%d", data.Options.WorkspaceId)
diff --git a/plugins/tapd/tasks/worklog_extractor.go b/plugins/tapd/tasks/worklog_extractor.go
index 3fd54722..ea7f1357 100644
--- a/plugins/tapd/tasks/worklog_extractor.go
+++ b/plugins/tapd/tasks/worklog_extractor.go
@@ -35,7 +35,7 @@ var ExtractWorklogMeta = core.SubTaskMeta{
 }
 
 func ExtractWorklogs(taskCtx core.SubTaskContext) error {
-	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_WORKLOG_TABLE)
+	rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_WORKLOG_TABLE, false)
 	extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{
 		RawDataSubTaskArgs: *rawDataSubTaskArgs,
 		Extract: func(row *helper.RawData) ([]interface{}, error) {