|
@@ -174,8 +174,15 @@ func GetUserArticleHistoryIndustrialNewPublishDate(user *models.WxUserItem, indu
|
|
|
} else {
|
|
|
condition = ` AND a.article_type_id = 0 AND a.article_id < ` + strconv.Itoa(utils.SummaryArticleId)
|
|
|
}
|
|
|
+ var startTime time.Time
|
|
|
+ if utils.StrTimeToTime(utils.OnlineTime).After(user.CreatedTime) {
|
|
|
+ startTime = utils.StrTimeToTime(utils.OnlineTime)
|
|
|
+ } else {
|
|
|
+ startTime = user.CreatedTime
|
|
|
+ }
|
|
|
+
|
|
|
condition += ` AND mg.industrial_management_id IN (` + utils.GetOrmInReplace(len(industrialIdArr)) + `) AND a.publish_date > ? `
|
|
|
- pars = append(pars, industrialIdArr, user.CreatedTime)
|
|
|
+ pars = append(pars, industrialIdArr, startTime)
|
|
|
|
|
|
list, err := models.GetCygxIndustrialArticleGroupManagement(condition, pars)
|
|
|
if err != nil {
|
|
@@ -194,7 +201,8 @@ func GetUserArticleHistoryIndustrialNewPublishDate(user *models.WxUserItem, indu
|
|
|
}
|
|
|
for k, v := range mapIndustrialArticle {
|
|
|
for _, item := range v {
|
|
|
- if articleIdMap[item.ArticleId] {
|
|
|
+ if !articleIdMap[item.ArticleId] {
|
|
|
+ fmt.Println(item.ArticleId)
|
|
|
mapIndustrialArticleHistory[k] = true
|
|
|
}
|
|
|
}
|