From 1bb0eb150deea41a59b707608b4fb83be95eb196 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Thu, 14 May 2020 22:38:22 +0800 Subject: [PATCH] Add count where condition 'deleted' at 'is null --- models/loginlog.go | 2 +- models/operlog.go | 2 +- models/post.go | 2 +- models/role.go | 2 +- models/sysuser.go | 2 +- models/tools/systables.go | 2 +- template/model.go.template | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/loginlog.go b/models/loginlog.go index 4f6e3866..702c6444 100644 --- a/models/loginlog.go +++ b/models/loginlog.go @@ -64,7 +64,7 @@ func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int, error) if err := table.Order("info_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } diff --git a/models/operlog.go b/models/operlog.go index b59bb476..ae8c5933 100644 --- a/models/operlog.go +++ b/models/operlog.go @@ -76,7 +76,7 @@ func (e *SysOperLog) GetPage(pageSize int, pageIndex int) ([]SysOperLog, int, er if err := table.Order("oper_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } diff --git a/models/post.go b/models/post.go index 2a85d8b1..56a7cfef 100644 --- a/models/post.go +++ b/models/post.go @@ -104,7 +104,7 @@ func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) { if err := table.Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } diff --git a/models/role.go b/models/role.go index 77dc8070..957ec020 100644 --- a/models/role.go +++ b/models/role.go @@ -59,7 +59,7 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) { if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } diff --git a/models/sysuser.go b/models/sysuser.go index 86ab2c63..d9f6ee00 100644 --- a/models/sysuser.go +++ b/models/sysuser.go @@ -153,7 +153,7 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, erro if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } diff --git a/models/tools/systables.go b/models/tools/systables.go index 17f354f3..a88b4a11 100644 --- a/models/tools/systables.go +++ b/models/tools/systables.go @@ -65,7 +65,7 @@ func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, erro if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } diff --git a/template/model.go.template b/template/model.go.template index fa0320e4..5aa713c4 100644 --- a/template/model.go.template +++ b/template/model.go.template @@ -76,7 +76,7 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}}, if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { return nil, 0, err } - table.Count(&count) + table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil }