fix: 分类排序

models/tables/my_chart_classify/query.go

@@ -7,13 +7,13 @@ import (
 )
 
 // GetClassifyListByCondition 根据条件获取图表分类列表
-func GetClassifyListByCondition(condition map[string]interface{}) (list []*MyChartClassify, err error) {
+func GetClassifyListByCondition(condition map[string]interface{}, sort string) (list []*MyChartClassify, err error) {
 	maps, values, buildErr := utils.WhereBuild(condition)
 	if buildErr != nil {
 		err = errors.New("系统异常，生成查询语句失败")
 		return
 	}
-	err = global.MYSQL["data"].Model(MyChartClassify{}).Where(maps, values...).Order("sort ASC").Scan(&list).Error
+	err = global.MYSQL["data"].Model(MyChartClassify{}).Where(maps, values...).Order(sort).Scan(&list).Error
 
 	return
 }

services/chart/my_chart.go

@@ -20,7 +20,7 @@ func GetUserChartClassifyListByCondition(userInfo user.UserInfo, publicCondition
 		publicCondition["is_public"] = 1
 		publicCondition["admin_id !="] = adminInfo.AdminID
 		privateCondition["admin_id"] = adminInfo.AdminID
-		privateClassify, err = my_chart_classify.GetClassifyListByCondition(privateCondition)
+		privateClassify, err = my_chart_classify.GetClassifyListByCondition(privateCondition, "sort ASC, my_chart_classify_id ASC")
 		if err != nil {
 			err = errors.New("获取我的图表分类失败, Err:" + err.Error())
 			return
@@ -31,7 +31,7 @@ func GetUserChartClassifyListByCondition(userInfo user.UserInfo, publicCondition
 		publicCondition["is_company_public"] = 1
 	}
 
-	publicClassify, err = my_chart_classify.GetClassifyListByCondition(publicCondition)
+	publicClassify, err = my_chart_classify.GetClassifyListByCondition(publicCondition, "public_time ASC")
 	if err != nil {
 		err = errors.New("获取公共图表分类失败, Err:" + err.Error())
 		return