From 812814421dcd3685e34f937b44e7eaf1d2ab18eb Mon Sep 17 00:00:00 2001 From: lj-wsdj <1134294381@qq.com> Date: Thu, 22 Aug 2024 16:20:30 +0800 Subject: [PATCH] fix --- db/build.go | 2 +- main_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/db/build.go b/db/build.go index 7b765cc..9ebd314 100644 --- a/db/build.go +++ b/db/build.go @@ -23,7 +23,7 @@ func (s *SqlBuilder[T]) buildPaginateSql(sqls string) string { if s.Driver == util.DriverMysql { return fmt.Sprintf("%s limit %d offset %d", sqls, pageSize, (pageIndex-1)*pageSize) } else if s.Driver == util.DriverOracle { - return fmt.Sprintf("select * from (select t.*, rownum rn from (%s) t where rownum <= %d) where rn > %d", sqls, pageIndex*pageSize, (pageIndex-1)*pageSize) + return fmt.Sprintf("select * from (%s where rownum <= %d) where rn > %d", sqls, pageIndex*pageSize, (pageIndex-1)*pageSize) } else { return fmt.Sprintf("%s limit %d offset %d", sqls, pageSize, (pageIndex-1)*pageSize) } diff --git a/main_test.go b/main_test.go index f2c15bf..1f466fb 100644 --- a/main_test.go +++ b/main_test.go @@ -65,7 +65,8 @@ func TestOracle(t *testing.T) { sqlb.InsertConditions("@c1", "area_dn like ?", "level1=1,level2=85226,level3=86918,level4=86919,level5=86986%") sqlb.InsertConditions("@c2", "autoseq in (?)", ids) page := Page{PageIndex: 1, PageSize: 10} - err = sqlb.FindBySql(&data) + // err = sqlb.FindBySql(&data) + err = sqlb.PaginateBySql(&data, &page) fmt.Println(data) page.Data = &data fmt.Println(err, page)