diff --git a/dsBigData/Business/Dict/DictController/DictController.go b/dsBigData/Business/Dict/DictController/DictController.go index 92e673ed..c442b255 100644 --- a/dsBigData/Business/Dict/DictController/DictController.go +++ b/dsBigData/Business/Dict/DictController/DictController.go @@ -3,7 +3,6 @@ package DictController import ( "dsBigData/Business/Dict/DictService" "dsBigData/Model" - "fmt" "github.com/gin-gonic/gin" "net/http" ) @@ -13,21 +12,10 @@ func Routers(r *gin.RouterGroup) { rr := r.Group("/dict") rr.GET("/GetXxbxlx", GetXxbxlx) - - rr.POST("/Test", Test) - + return } -func Test(c *gin.Context) { - abc := "aaa" - fmt.Println(abc) - c.JSON(http.StatusOK, Model.Res{ - Success: true, - List: "ok", - }) -} - /** 功能:获取学校办学类型字典 */ diff --git a/dsBigData/Business/Dict/DictDao/DictDao.go b/dsBigData/Business/Dict/DictDao/DictDao.go index db9610dc..f182dbcf 100644 --- a/dsBigData/Business/Dict/DictDao/DictDao.go +++ b/dsBigData/Business/Dict/DictDao/DictDao.go @@ -29,6 +29,7 @@ func GetDictInfo(dictKind string) ([]DictModel.Dict, error) { Index("sys_dic"). Query(boolQuery). Size(100). + Sort("data_content.sort_id", true). Do(CTX) if err != nil { return nil, err diff --git a/dsBigData/build/dsBigData b/dsBigData/build/dsBigData index 5b42e2a1..41ea214b 100644 Binary files a/dsBigData/build/dsBigData and b/dsBigData/build/dsBigData differ