|
@@ -268,6 +268,10 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
|
|
mapActivity := make(map[int][]*models.CygxActivityLabelList)
|
|
mapActivity := make(map[int][]*models.CygxActivityLabelList)
|
|
activityIds := make([]int, 0) // 用于查询活动【新】标签Map
|
|
activityIds := make([]int, 0) // 用于查询活动【新】标签Map
|
|
for _, v := range listActivity {
|
|
for _, v := range listActivity {
|
|
|
|
+ // 如果是C类电话会就不展示内容,且合并到分析师电话会
|
|
|
|
+ if v.ActivityTypeId == 7 {
|
|
|
|
+ v.ActivityTypeId = 2
|
|
|
|
+ }
|
|
if v.ActivityTypeId == 1 {
|
|
if v.ActivityTypeId == 1 {
|
|
activityIds = append(activityIds, v.ActivityId)
|
|
activityIds = append(activityIds, v.ActivityId)
|
|
}
|
|
}
|
|
@@ -285,11 +289,12 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
|
|
}
|
|
}
|
|
// 如果是C类电话会就不展示内容,且合并到分析师电话会
|
|
// 如果是C类电话会就不展示内容,且合并到分析师电话会
|
|
if v.ActivityTypeId == 7 {
|
|
if v.ActivityTypeId == 7 {
|
|
- v.ActivityTypeId = 1
|
|
|
|
|
|
+ v.ActivityTypeId = 2
|
|
}
|
|
}
|
|
item := new(models.CygxActivityLabelList)
|
|
item := new(models.CygxActivityLabelList)
|
|
item.KeyWord = LabelStr(v.Label, v.IsShowSubjectName, v.TemporaryLabel)
|
|
item.KeyWord = LabelStr(v.Label, v.IsShowSubjectName, v.TemporaryLabel)
|
|
item.Resource = 1
|
|
item.Resource = 1
|
|
|
|
+ item.ActivityId = v.ActivityId
|
|
if v.YidongActivityId != "" {
|
|
if v.YidongActivityId != "" {
|
|
item.IsExternalLabel = true
|
|
item.IsExternalLabel = true
|
|
}
|
|
}
|