evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加排序参数

Browse Source
This commit is contained in:
dushixiang
2021-03-05 17:33:13 +08:00
parent 0ef8f4276e
commit 1472ec73a7
18 changed files with 206 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/asset.go
View File

@ -55,8 +55,11 @@ func AssetPagingEndpoint(c echo.Context) error {
userGroupId := c.QueryParam("userGroupId")
ip := c.QueryParam("ip")
order := c.QueryParam("order")
field := c.QueryParam("field")
account, _ := GetCurrentAccount(c)
items, total, err := model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, account, owner, sharer, userGroupId, ip)
items, total, err := model.FindPageAsset(pageIndex, pageSize, name, protocol, tags, account, owner, sharer, userGroupId, ip, order, field)
if err != nil {
return err
}

5
pkg/api/command.go
View File

@ -34,7 +34,10 @@ func CommandPagingEndpoint(c echo.Context) error {
content := c.QueryParam("content")
account, _ := GetCurrentAccount(c)
items, total, err := model.FindPageCommand(pageIndex, pageSize, name, content, account)
order := c.QueryParam("order")
field := c.QueryParam("field")
items, total, err := model.FindPageCommand(pageIndex, pageSize, name, content, order, field, account)
if err != nil {
return err
}

5
pkg/api/credential.go
View File

@ -62,8 +62,11 @@ func CredentialPagingEndpoint(c echo.Context) error {
pageSize, _ := strconv.Atoi(c.QueryParam("pageSize"))
name := c.QueryParam("name")
order := c.QueryParam("order")
field := c.QueryParam("field")
account, _ := GetCurrentAccount(c)
items, total, err := model.FindPageCredential(pageIndex, pageSize, name, account)
items, total, err := model.FindPageCredential(pageIndex, pageSize, name, order, field, account)
if err != nil {
return err
}

5
pkg/api/job.go
View File

@ -29,7 +29,10 @@ func JobPagingEndpoint(c echo.Context) error {
name := c.QueryParam("name")
status := c.QueryParam("status")
items, total, err := model.FindPageJob(pageIndex, pageSize, name, status)
order := c.QueryParam("order")
field := c.QueryParam("field")
items, total, err := model.FindPageJob(pageIndex, pageSize, name, status, order, field)
if err != nil {
return err
}

5
pkg/api/user-group.go
View File

@ -39,7 +39,10 @@ func UserGroupPagingEndpoint(c echo.Context) error {
pageSize, _ := strconv.Atoi(c.QueryParam("pageSize"))
name := c.QueryParam("name")
items, total, err := model.FindPageUserGroup(pageIndex, pageSize, name)
order := c.QueryParam("order")
field := c.QueryParam("field")
items, total, err := model.FindPageUserGroup(pageIndex, pageSize, name, order, field)
if err != nil {
return err
}

5
pkg/api/user.go
View File

@ -37,7 +37,10 @@ func UserPagingEndpoint(c echo.Context) error {
username := c.QueryParam("username")
nickname := c.QueryParam("nickname")
items, total, err := model.FindPageUser(pageIndex, pageSize, username, nickname)
order := c.QueryParam("order")
field := c.QueryParam("field")
items, total, err := model.FindPageUser(pageIndex, pageSize, username, nickname, order, field)
if err != nil {
return err
}