Merge branch 'fix_bug_2021-06-23-10-40' of hongze/hongze_cygx into master

services/tactics.go

@@ -429,7 +429,7 @@ func SyncTacticsListAddreport() (err error) {
 			updateParams["BodyText"] = bodyText
 			updateParams["Abstract"] = html.EscapeString(v.Abstract)
 			updateParams["CategoryName"] = v.CategoryName
-			updateParams["SubCategoryName"] = v.SubCategoryName
+
 			for _, vCustom := range listCustomArticle {
 				if v.ArticleId == vCustom.ArticleId {
 					fmt.Println("手动归类的文章:" + strconv.Itoa(v.ArticleId))
@@ -439,6 +439,10 @@ func SyncTacticsListAddreport() (err error) {
 			if isCustom == false {
 				updateParams["CategoryId"] = v.CategoryId
 				updateParams["MatchTypeName"] = matchTypeName
+				updateParams["IsSummary"] = v.IsSummary
+				updateParams["IsReport"] = v.IsReport
+				updateParams["ReportType"] = v.ReportType
+				updateParams["SubCategoryName"] = v.SubCategoryName
 			}
 			//updateParams["CategoryId"] = v.CategoryId
 			updateParams["PublishStatus"] = v.PublishStatus
@@ -446,9 +450,7 @@ func SyncTacticsListAddreport() (err error) {
 			updateParams["ExpertNumber"] = expertNumStr
 			updateParams["InterviewDate"] = interviewDateStr
 			//updateParams["IsClass"] = v.IsClass
-			updateParams["IsSummary"] = v.IsSummary
-			updateParams["IsReport"] = v.IsReport
-			updateParams["ReportType"] = v.ReportType
+
 			if v.Department != "弘则权益研究" {
 				v.Department = "弘则权益研究"
 			}