|
@@ -1061,15 +1061,22 @@ func (this *ActivityCoAntroller) Detail() {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
activityInfo.SignupType = mapActivitySignup[activityId]
|
|
activityInfo.SignupType = mapActivitySignup[activityId]
|
|
|
|
+ //处理活动关联的产业
|
|
|
|
+ industrialListNew, err := models.GetIndustrialActivityGroupManagementList(activityId)
|
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
|
+ br.ErrMsg = "获取活动关联的产业列表信息失败,Err:" + err.Error() + "activityId:" + strconv.Itoa(activityId)
|
|
|
|
+ return
|
|
|
|
+ }
|
|
//判断是不是通过微信模版推送消息进来的
|
|
//判断是不是通过微信模版推送消息进来的
|
|
- if isSendWx == 1 && len(industrialList) > 0 {
|
|
|
|
|
|
+ if isSendWx == 1 && len(industrialListNew) > 0 {
|
|
industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
|
|
industryUserFollowMap, err := services.GetIndustryUserFollowMap(user)
|
|
if err != nil {
|
|
if err != nil {
|
|
br.Msg = "获取信息失败"
|
|
br.Msg = "获取信息失败"
|
|
br.ErrMsg = "GetActivitySignupResp,Err:" + err.Error()
|
|
br.ErrMsg = "GetActivitySignupResp,Err:" + err.Error()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- for _, v := range industrialList {
|
|
|
|
|
|
+ for _, v := range industrialListNew {
|
|
if industryUserFollowMap[v.IndustrialManagementId] {
|
|
if industryUserFollowMap[v.IndustrialManagementId] {
|
|
activityInfo.IsFollowButton = true
|
|
activityInfo.IsFollowButton = true
|
|
}
|
|
}
|