Merge branch 'cygx_11.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/article.go

@@ -91,7 +91,6 @@ func (this *ArticleController) Detail() {
 		detail.IsResearch = true
 	}
 
-	detail.IsApplyAppointmentExpert = services.GetIsApplyAppointmentExpert(user, articleId) // 获取用户数是否约访专家的请求  查研观向11.0
 	// 高毅资产的联系人，有权限的行业也不能查看报告详情页。提示无权限页面
 	if detail.ArticleTypeId == 0 && user.CompanyId == utils.GAO_YI_ZI_CHAN_COMPANY_ID {
 		_, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermissionArticle(user)
@@ -430,6 +429,9 @@ Loop:
 			detail.ReportLink += "?token=" + chartUserTokenByMobile
 		}
 	}
+	if detail.ArticleTypeId == 14 {
+		detail.IsApplyAppointmentExpert = true //判断文章类型是否属于专家访谈  查研观向11.0
+	}
 	resp.HasPermission = hasPermission
 	resp.HaveResearch = haveResearch
 	resp.Detail = detail

models/article.go

@@ -177,7 +177,7 @@ type ArticleDetail struct {
 	ReportType               int    `description:"报告类型，1行业报告，2产业报告,0无"`
 	FieldName                string `description:"策略平台的领域字段名称"`
 	TypeName                 string `description:"策略平台类型字段名称"`
-	IsApplyAppointmentExpert bool   `description:"是否预约过专家"`
+	IsApplyAppointmentExpert bool   `description:"是否属于专家访谈"`
 }
 
 type ArticleDetailFileLink struct {

services/activity.go

@@ -1151,7 +1151,7 @@ func GetActivityonditionList(user *models.WxUserItem, activityTypeId, chartPermi
 func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower int) (conditionActivity string, err error) {
 	// cygx_10.9 未绑定联系方式的客户可以看到部分活动
 	if user.UserId == 0 || user.CompanyId == 1 {
-		conditionActivity  = ` AND art.publish_status = 1  AND art.visible_range != 1 AND (art.is_limit_people = 0 OR (art.is_limit_people=1 AND art.is_all_customer_type=1))   ` + condition
+		conditionActivity = ` AND art.publish_status = 1  AND art.visible_range != 1 AND (art.is_limit_people = 0 OR (art.is_limit_people=1 AND art.is_all_customer_type=1))   ` + condition
 		return
 	}
 	condition += `   AND art.publish_status = 1 `
@@ -2276,10 +2276,11 @@ func DoActivityOnenIdWxTemplateMsg(cont context.Context) (err error) {
 }
 
 func ActivityButtonShow(item *models.ActivityDetail) (activityDetail *models.ActivityDetail) {
-	activityDetail = item
+
 	if item.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 		item.IsResearch = true
 	}
+	activityDetail = item
 	//IsShowAppointment       bool                       `description:"是否展示预约纪要"`
 	//IsShowOutboundCall      bool                       `description:"是否展示预约外呼"`
 	//IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`