|
@@ -2350,10 +2350,10 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
|
|
|
}
|
|
|
item.Resource = 1
|
|
|
item.ActivityId = v.ActivityId
|
|
|
- //if v.YidongActivityId > 0 {
|
|
|
- item.IsExternalLabel = v.IsExternalLabel
|
|
|
- item.IsResearchPoints = v.IsResearchPoints
|
|
|
- //}
|
|
|
+ if v.ActivityTypeId == 3 {
|
|
|
+ item.IsExternalLabel = v.IsExternalLabel
|
|
|
+ item.IsResearchPoints = v.IsResearchPoints
|
|
|
+ }
|
|
|
mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)
|
|
|
mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", item.KeyWord)] = item.KeyWord
|
|
|
}
|
|
@@ -2364,16 +2364,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
|
|
|
br.ErrMsg = "获取数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- //判断客户规模是否属于可见范围的活动
|
|
|
- //companyProduct, err := models.GetCompanyProductDetail(user.CompanyId, 2)
|
|
|
- //if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
- // br.Msg = "获取信息失败"
|
|
|
- // br.ErrMsg = "获取客户信息失败,Err:" + err.Error()
|
|
|
- // return
|
|
|
- //}
|
|
|
- //isMaker := user.IsMaker
|
|
|
|
|
|
- //var sqlExport string
|
|
|
resp := new(models.ActivityTypeListHomeResp)
|
|
|
for k, v := range list {
|
|
|
if len(mapActivity[v.ActivityTypeId]) > 0 {
|