diff --git a/entgo/go.mod b/entgo/go.mod index 957a87f..d321a0e 100644 --- a/entgo/go.mod +++ b/entgo/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-kratos/kratos/v2 v2.7.1 github.com/google/uuid v1.4.0 github.com/stretchr/testify v1.8.4 - github.com/tx7do/go-utils v1.1.0 + github.com/tx7do/go-utils v1.1.3 ) require ( diff --git a/entgo/query/pagination.go b/entgo/query/pagination.go index dece764..c4ad1dc 100644 --- a/entgo/query/pagination.go +++ b/entgo/query/pagination.go @@ -17,6 +17,13 @@ func BuildPaginationSelector(page, pageSize int32, noPaging bool) func(*sql.Sele } func BuildPaginationSelect(s *sql.Selector, page, pageSize int32) { + if page < 1 { + page = paging.DefaultPage + } + + if pageSize < 1 { + pageSize = paging.DefaultPageSize + } offset := paging.GetPageOffset(page, pageSize) s.Offset(offset).Limit(int(pageSize)) } diff --git a/pagination/pagination.go b/pagination/pagination.go index 2fd10c7..cb9e1b4 100644 --- a/pagination/pagination.go +++ b/pagination/pagination.go @@ -7,13 +7,5 @@ const ( // GetPageOffset 计算偏移量 func GetPageOffset(pageNum, pageSize int32) int { - if pageNum < 1 { - pageNum = DefaultPage - } - - if pageSize < 1 { - pageSize = DefaultPageSize - } - return int((pageNum - 1) * pageSize) } diff --git a/tag.bat b/tag.bat index f30043d..f41fb6c 100644 --- a/tag.bat +++ b/tag.bat @@ -1,6 +1,6 @@ -git tag v1.1.2 +git tag v1.1.3 git tag bank_card/v1.1.0 -git tag entgo/v1.1.2 +git tag entgo/v1.1.3 git tag geoip/v1.1.0 git push origin --tags