查找keyWordMapping表时不筛选from字段

models/tables/chart_permission_search_key_word_mapping/query.go

@@ -43,4 +43,19 @@ func GetKeyWordsByChartPermissionId(charPermissionId int, from string) (keyWords
 		}
 	}
 	return
+}
+
+// GetKeyWordsByChartPermissionId 根据权限ID， 查询二级分类名称
+func GetKeyWordsByChartPermissionIdOnly(charPermissionId int) (keyWords []string, err error)  {
+	var list []*ChartPermissionSearchKeyWordMapping
+	err = global.DEFAULT_MYSQL.Model(ChartPermissionSearchKeyWordMapping{}).Where("chart_permission_id = ? ", charPermissionId).Scan(&list).Error
+	if err != nil && err != utils.ErrNoRow {
+		return
+	}
+	if len(list) > 0 {
+		for _, item := range list {
+			keyWords = append(keyWords, item.KeyWord)
+		}
+	}
+	return
 }

services/report/report.go

@@ -1259,7 +1259,7 @@ func GetVarietyReportList(user user.UserInfo, classifyId, chartPermissionId, pag
 	var allClassifySecondIds []int
 	var classifySecondIds []int
 
-	classifyNames, err := chart_permission_search_key_word_mapping.GetKeyWordsByChartPermissionId(chartPermissionId, "two_week")
+	classifyNames, err := chart_permission_search_key_word_mapping.GetKeyWordsByChartPermissionIdOnly(chartPermissionId)
 	if err != nil {
 		errMsg = err.Error()
 		err = errors.New("查询权限对应的分类出错")