|
|
@@ -485,9 +485,9 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
|
|
|
if v.ActivityTypeId == 7 {
|
|
|
v.ActivityTypeId = 2
|
|
|
}
|
|
|
- if v.ActivityTypeId == 1 {
|
|
|
- activityIds = append(activityIds, v.ActivityId)
|
|
|
- }
|
|
|
+ //if v.ActivityTypeId == 1 {
|
|
|
+ activityIds = append(activityIds, v.ActivityId)
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
// 活动【新】标签Map
|
|
|
@@ -854,11 +854,10 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
|
|
|
if len(activityIds) == 0 {
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
// 获取活动关联的产业
|
|
|
var groupCond string
|
|
|
var groupPars []interface{}
|
|
|
- groupCond += ` AND a.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `) AND b.source = 1 AND a.active_state != 3 `
|
|
|
+ groupCond += ` AND a.activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `) AND b.source = 1 `
|
|
|
groupPars = append(groupPars, activityIds)
|
|
|
groups, e := models.GetActivityIndustryRelationList(groupCond, groupPars)
|
|
|
if e != nil {
|
|
|
@@ -878,7 +877,6 @@ func GetActivityNewLabelMap(activityIds []int) (labelMap map[int]bool, industryN
|
|
|
err = errors.New("获取产业新标签Map失败, Err: " + e.Error())
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
// 判断活动是否为新
|
|
|
for k := range industryLabelMap {
|
|
|
for k2, v2 := range activityIndustryMap {
|
xingzai