|
@@ -2602,13 +2602,14 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
|
|
}
|
|
}
|
|
//研选互动不展示专项产业调研
|
|
//研选互动不展示专项产业调研
|
|
if !isResearch {
|
|
if !isResearch {
|
|
- conditionActivitySpecial := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
|
|
|
|
- //查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
|
|
|
|
- //if whichDay == "" {
|
|
|
|
//专项产业调研未开始状态不查询
|
|
//专项产业调研未开始状态不查询
|
|
if activeState == "1" {
|
|
if activeState == "1" {
|
|
activeState = ""
|
|
activeState = ""
|
|
}
|
|
}
|
|
|
|
+ conditionActivitySpecial := services.ActivityLabelSpecialSql(chartPermissionIds, whichDay, activeState)
|
|
|
|
+ //查询专项产业调研展示权限 仅对大套餐客户跟永续客户展示
|
|
|
|
+ //if whichDay == "" {
|
|
|
|
+
|
|
//speciaItem, err := services.GetActivityLabelSpecialList(user, isPower, chartPermissionIds, permissionNameStr)
|
|
//speciaItem, err := services.GetActivityLabelSpecialList(user, isPower, chartPermissionIds, permissionNameStr)
|
|
speciaItem, err := services.GetActivityLabelSpecialList(user, conditionActivitySpecial, activeState)
|
|
speciaItem, err := services.GetActivityLabelSpecialList(user, conditionActivitySpecial, activeState)
|
|
if err != nil {
|
|
if err != nil {
|