no message

models/activity.go

@@ -179,6 +179,8 @@ type ActivityListResp struct {
 	OnlineParticipation     string                     `description:"网络参会"`
 	ReportLink              string                     `description:"报告链接"`
 	LinkParticipants        string                     `description:"链接参会"`
+	AppAttendance           string                     `description:"App参会"`
+	ConferencePassword      string                     `description:"会议密码"`
 	City                    string                     `description:"城市"`
 	Address                 string                     `description:"活动地址"`
 	Highlights              string                     `description:"活动亮点"`

services/activity.go

@@ -725,6 +725,8 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		ActivityName:            v.ActivityName,
 		OnlineParticipation:     v.OnlineParticipation,
 		ReportLink:              v.ReportLink,
+		AppAttendance:           v.AppAttendance,
+		ConferencePassword:      v.ConferencePassword,
 		City:                    v.City,
 		Address:                 v.Address,
 		Highlights:              v.Highlights,
@@ -967,6 +969,21 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
 		return
 	}
+	//如果是 公司调研电话会：3，或 专家线下沙龙:5  而且  除易董同步过来的以外的研选类型活动，必须要有研选的正式权限
+	if (activityInfo.ActivityTypeId == 3 || activityInfo.ActivityTypeId == 5) && activityInfo.YidongActivityId == "" && strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
+		isResearchSpecial = true
+	}
+	//如果是 研选扣点的必须要有研选的正式权限
+	if activityInfo.IsResearchPoints {
+		if !strings.Contains(permissionStr, utils.CHART_PERMISSION_NAME_YANXUAN) {
+			//如果连试用权限都没有，那么久按照普通的研选样式展示
+			isResearchSpecial = false
+		}
+		if !strings.Contains(permissionStrZhengShi, activityInfo.ChartPermissionName) {
+			havePower = false
+			return
+		}
+	}
 
 	//处理决策人可见权限
 	if user.IsMaker == 0 && activityInfo.IsMakerShow == 1 {
@@ -1001,6 +1018,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		havePower = true
 		return
 	}
+
 	//医药消费，科技，智造四大行业，验证主客观。如果主客观校验不通过，那么直接返回
 	if strings.Contains(utils.YI_YAO_NAME+utils.XIAO_FEI_NAME+utils.KE_JI_NAME+utils.ZHI_ZAO_NAME, activityInfo.ChartPermissionName) {
 		if activityInfo.ActivityTypeId == 2 || activityInfo.ActivityTypeId == 6 || activityInfo.ActivityTypeId == 7 {