111

api/controller/Basic.go

@@ -104,7 +104,7 @@ func (r *Basic) GetBaseClass(c *gin.Context) {
 	responses.OkWithData(g, c)
 }
 
-// GetAreaList 获取分类列表
+// GetAreaList 获取地区列表
 func (r *Basic) GetAreaList(c *gin.Context) {
 	basicRequest := requests.BasicRequest{}
 	req := basicRequest.GetAreaList

api/dao/BaseClass.go

@@ -163,8 +163,14 @@ func (r *BaseClassDao) GetBaseClassListSearch(req requests.GetBaseClassList) (m
 // GetBaseClassExistsOrderList 获取列表-排序
 func (r *BaseClassDao) GetBaseClassExistsOrderList(maps interface{}) (m []*model.BaseClass, err error) {
 	err = global.Db.Where(maps).
-		Where("EXISTS (?)", global.Db.Model(&model.QuestionClass{}).Select("1").Where("question_class.class_id = base_class.class_id")).
-		Order("sort desc").Find(&m).Error
+		Where(
+			"EXISTS (?)",
+			global.Db.Model(&model.QuestionClass{}).Select("1").
+				Where("question_class.class_id = base_class.class_id")).
+		Order("sort desc").
+		Order("convert(substring(class_name,1,1) using `GBK`) asc").
+		Find(&m).
+		Error
 	if err != nil {
 		return nil, err
 	}