Merge branch 'cygx_12.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/tactics.go

@@ -87,6 +87,7 @@ func (this *TacticsController) List() {
 	}
 	ArticleHistoryMap := services.GetArticleHistoryByUser(articleIds, user)
 	ProductInteriorHistoryMap := services.GetCygxProductInteriorHistoryListMap(productInteriorIs, user)
+	productInteriorMapPv := services.GetCygxProductInteriorHistoryListPvMap(productInteriorIs) //产品内测Pv
 	for k, v := range list {
 		if v.Resource == 1 {
 			if ArticleHistoryMap[v.ArticleId] == 0 && user.CreatedTime.Before(utils.StrTimeToTime(v.PublishDate)) && utils.StrTimeToTime(utils.OnlineTime).Before(utils.StrTimeToTime(v.PublishDate)) {
@@ -124,7 +125,7 @@ func (this *TacticsController) List() {
 		}
 		if v.Resource == 2 {
 			v.PublishDate = utils.TimeRemoveHms2(v.PublishDate)
-			v.Pv = ProductInteriorHistoryMap[v.ArticleId]
+			v.Pv = productInteriorMapPv[v.ArticleId]
 		}
 	}
 	resp.List = list