Merge remote-tracking branch 'origin/eta/1.3.1' into debug

controllers/data_manage/cross_variety/chart_info.go

@@ -1283,7 +1283,7 @@ func (c *ChartInfoController) SearchByEs() {
 	if keyword != "" {
 		searchList, total, err = data.EsSearchChartInfo(keyword, showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 	} else {
-		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList)
+		total, searchList, err = data_manage.ChartInfoSearchByEmptyKeyWord(showSysId, sourceList, noPermissionChartIdList, startSize, pageSize)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取图表信息失败，Err:" + err.Error()

models/data_manage/cross_variety/chart_tag.go

@@ -118,3 +118,29 @@ func GetTagListByIdList(idList []int) (items []*ChartTag, err error) {
 
 	return
 }
+
+// ChartTag
+// @Description: chart_tag 图表标签表
+type ChartTagItem struct {
+	ChartTagId      int       `orm:"column(chart_tag_id);pk"`
+	ChartTagName    string    `description:"标签名称"`
+	SysUserId       int       `description:"创建人id"`
+	HasData         bool      `description:"是否关联品种"`
+	SysUserRealName string    `description:"创建人姓名"`
+	ModifyTime      time.Time `description:"修改时间"`
+	CreateTime      time.Time `description:"创建时间"`
+}
+
+// GetTagItemList
+// @Description: 获取所有标签列表（列表页用到的）
+// @author: Roc
+// @datetime 2023-11-22 10:44:35
+// @return items []*ChartTag
+// @return err error
+func GetTagItemList() (items []*ChartTag, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM chart_tag WHERE 1 = 1 `
+	_, err = o.Raw(sql).QueryRows(&items)
+
+	return
+}