no message

controllers/activity.go

@@ -534,6 +534,13 @@ func (this *ActivityNoLoginController) ActivityListNew() {
 			if v.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, v.ChartPermissionName) {
 				au.HasPermission = 2
 			}
+
+			//如果是易董的活动，主、副权限有一个满足即可 查研观向 11.0
+			if v.YidongActivityId != "" {
+				if utils.InArrayByStr(permissionArr, v.ChartPermissionName) || utils.InArrayByStr(permissionArr, v.ChartPermissionNameDeputy) {
+					au.HasPermission = 1
+				}
+			}
 		}
 
 		// 无权限的弹框提示
@@ -2000,6 +2007,12 @@ func (this *ActivityController) ActivityListSearch() {
 			if v.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, v.ChartPermissionName) {
 				au.HasPermission = 2
 			}
+			//如果是易董的活动，主、副权限有一个满足即可 查研观向 11.0
+			if v.YidongActivityId != "" {
+				if utils.InArrayByStr(permissionArr, v.ChartPermissionName) || utils.InArrayByStr(permissionArr, v.ChartPermissionNameDeputy) {
+					au.HasPermission = 1
+				}
+			}
 		}
 		// 无权限的弹框提示
 		if au.HasPermission != 1 {

models/activity.go

@@ -562,6 +562,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.activity_time,
 			0 AS days,
 			art.city AS city,
+			art.is_external_label,
 			art.is_yidong_conduct,
 			art.is_can_outbound_call,
 			art.is_research_points,
@@ -604,6 +605,7 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			"",
 			"",
 			"",
+			"",
 			art.host 
 		FROM
 			cygx_activity_special AS art

services/activity.go

@@ -524,6 +524,12 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		if v.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 			item.IsResearch = true
 		}
+
+		//易董同步过来的活动只展示外部资源标签
+		if v.YidongActivityId != "" {
+			item.IsResearchPoints = false
+			item.IsResearch = false
+		}
 		if v.IsExternalLabel > 0 {
 			item.IsExternalLabel = true
 		}
@@ -720,18 +726,19 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 			}
 		}
 	}
-	//如果是易董同步过来的，只展示外部资源标签
-	if activityDetail.YidongActivityId != "" {
-		activityDetail.IsExternalLabel = true
-		activityDetail.IsResearch = false
-		activityDetail.IsResearchSpecial = false
-	}
+
 	activityDetail.IsResearchPoints = activityPointsByUserAllMap[activityDetail.ActivityId]
 	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 	if e != nil {
 		e = errors.New("获取用户权限失败, Err: " + e.Error())
 		return
 	}
+	//如果是易董同步过来的，只展示外部资源标签
+	if activityDetail.YidongActivityId != "" {
+		activityDetail.IsExternalLabel = true
+		activityDetail.IsResearch = false
+		activityDetail.IsResearchSpecial = false
+	}
 	v := activityDetail
 	itemActivity = &models.ActivityListResp{
 		ActivityId:              v.ActivityId,
@@ -813,6 +820,13 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		if v.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, v.ChartPermissionName) {
 			au.HasPermission = 2
 		}
+
+		//如果是易董的活动，主、副权限有一个满足即可 查研观向 11.0
+		if v.YidongActivityId != "" {
+			if utils.InArrayByStr(permissionArr, v.ChartPermissionName) || utils.InArrayByStr(permissionArr, v.ChartPermissionNameDeputy) {
+				au.HasPermission = 1
+			}
+		}
 	}
 
 	// 无权限的弹框提示
@@ -1090,9 +1104,9 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 		}
 		//如果是易董同步过来的，只展示外部资源标签
 		if activityDetail.YidongActivityId != "" {
-			activityDetail.IsExternalLabel = true
-			activityDetail.IsResearch = false
-			activityDetail.IsResearchSpecial = false
+			itemActivity.IsExternalLabel = true
+			itemActivity.IsResearch = false
+			itemActivity.IsResearchSpecial = false
 		}
 		itemActivity.AuthInfo = au
 		//处理用户已经报名了的行程