no message

controllers/activity.go

@@ -3127,19 +3127,6 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		list[k].Resource = 1
 	}
 
-	//查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
-	if whichDay == "" {
-		speciaItem, err := services.GetActivityLabelSpecialList(user, isPower, chartPermissionIds, permissionNameStr)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，Err:" + err.Error()
-			return
-		}
-		if len(speciaItem.List) > 0 {
-			list = append(list, speciaItem)
-		}
-	}
-
 	//获取对应活动的数量并排序
 	activityIds := make([]int, 0) // 用于查询活动【新】标签Map
 	intArr := make([]int, 0)
@@ -3217,6 +3204,25 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 			rightPx += basicsHeight + rowHeight*lenList
 		}
 	}
+
+	//查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
+	if whichDay == "" {
+
+		speciaItem, err := services.GetActivityLabelSpecialList(user, isPower, chartPermissionIds, permissionNameStr)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		if leftPx > rightPx {
+			speciaItem.Position = 2
+		} else {
+			speciaItem.Position = 1
+		}
+		if len(speciaItem.List) > 0 {
+			list = append(list, speciaItem)
+		}
+	}
 	//记录用户搜索的筛选条件
 	item := new(models.CygxActivitySearchHistory)
 	item.UserId = user.UserId