gorm升级到v2版本

This commit is contained in:
linwenxiang committed 2020-08-27 11:17:15 +08:00
1 parent 93cfe443d6
commit 60c7496f7b
56 files changed
+630 -477

No files matched your search

+3 -3
View File
@@ -34,7 +34,7 @@ func (SysConfig) TableName() string {
// Config 创建
func (e *SysConfig) Create() (SysConfig, error) {
var doc SysConfig
i := 0
var i int64
orm.Eloquent.Table(e.TableName()).Where("config_name=? or config_key = ?", e.ConfigName, e.ConfigKey).Count(&i)
if i > 0 {
return doc, errors.New("参数名称或者参数键名已经存在!")
@@ -90,13 +90,13 @@ func (e *SysConfig) GetPage(pageSize int, pageIndex int) ([]SysConfig, int, erro
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *SysConfig) Update(id int) (update SysConfig, err error) {
+1 -1
View File
@@ -3,9 +3,9 @@ package models
import (
"errors"
"fmt"
"github.com/jinzhu/gorm"
"go-admin/tools"
"go-admin/tools/config"
"gorm.io/gorm"
)
type DataPermission struct {
+1 -1
View File
@@ -52,7 +52,7 @@ func (e *SysDept) Create() (SysDept, error) {
}
var mp = map[string]string{}
mp["deptPath"] = deptPath
if err := orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", e.DeptId).Update(mp).Error; err != nil {
if err := orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", e.DeptId).Updates(mp).Error; err != nil {
err := result.Error
return doc, err
}
+3 -3
View File
@@ -32,7 +32,7 @@ func (DictData) TableName() string {
func (e *DictData) Create() (DictData, error) {
var doc DictData
i := 0
var i int64
orm.Eloquent.Table(e.TableName()).Where("dict_label=? or (dict_label=? and dict_value = ?)", e.DictLabel, e.DictValue).Count(&i)
if i > 0 {
return doc, errors.New("字典标签或者字典键值已经存在!")
@@ -111,13 +111,13 @@ func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int, error)
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Order("dict_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *DictData) Update(id int) (update DictData, err error) {
+3 -3
View File
@@ -26,7 +26,7 @@ func (DictType) TableName() string {
func (e *DictType) Create() (DictType, error) {
var doc DictType
i := 0
var i int64
orm.Eloquent.Table(e.TableName()).Where("dict_name=? or dict_type = ?", e.DictName, e.DictType).Count(&i)
if i > 0 {
return doc, errors.New("字典名称或者字典类型已经存在!")
@@ -99,13 +99,13 @@ func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int, error)
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *DictType) Update(id int) (update DictType, err error) {
+9 -9
View File
@@ -7,12 +7,12 @@ import (
type SysFileDir struct {
Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` //
Label string `json:"label" gorm:"type:varchar(255);"` // 名称
PId int `json:"pId" gorm:"type:int(11);"` // 父id
Sort int `json:"sort" gorm:""` //排序
Path string `json:"path" gorm:"size:255;"` //
CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建人
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 编辑人
Label string `json:"label" gorm:"type:varchar(255);"` // 名称
PId int `json:"pId" gorm:"type:int(11);"` // 父id
Sort int `json:"sort" gorm:""` //排序
Path string `json:"path" gorm:"size:255;"` //
CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建人
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 编辑人
Children []SysFileDir `json:"children" gorm:"-"`
DataScope string `json:"dataScope" gorm:"-"`
Params string `json:"params" gorm:"-"`
@@ -42,7 +42,7 @@ func (e *SysFileDir) Create() (SysFileDir, error) {
}
var mp = map[string]string{}
mp["path"] = path
if err := orm.Eloquent.Table(e.TableName()).Where("id = ?", e.Id).Update(mp).Error; err != nil {
if err := orm.Eloquent.Table(e.TableName()).Where("id = ?", e.Id).Updates(mp).Error; err != nil {
err := result.Error
return doc, err
}
@@ -80,13 +80,13 @@ func (e *SysFileDir) GetPage() ([]SysFileDir, int, error) {
//if err != nil {
// return nil, 0, err
//}
var count int
var count int64
if err := table.Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
// 更新SysFileDir
+23 -25
View File
@@ -1,94 +1,93 @@
package gorm
import (
"github.com/jinzhu/gorm"
"go-admin/models"
"go-admin/models/tools"
"gorm.io/gorm"
)
func AutoMigrate(db *gorm.DB) error {
db.SingularTable(true)
err := db.AutoMigrate(new(models.CasbinRule)).Error
err := db.AutoMigrate(new(models.CasbinRule))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysDept)).Error
err = db.AutoMigrate(new(models.SysDept))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysConfig)).Error
err = db.AutoMigrate(new(models.SysConfig))
if err != nil {
return err
}
err = db.AutoMigrate(new(tools.SysTables)).Error
err = db.AutoMigrate(new(tools.SysTables))
if err != nil {
return err
}
err = db.AutoMigrate(new(tools.SysColumns)).Error
err = db.AutoMigrate(new(tools.SysColumns))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.Menu)).Error
err = db.AutoMigrate(new(models.Menu))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.LoginLog)).Error
err = db.AutoMigrate(new(models.LoginLog))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysOperLog)).Error
err = db.AutoMigrate(new(models.SysOperLog))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.RoleMenu)).Error
err = db.AutoMigrate(new(models.RoleMenu))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysRoleDept)).Error
err = db.AutoMigrate(new(models.SysRoleDept))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysUser)).Error
err = db.AutoMigrate(new(models.SysUser))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysRole)).Error
err = db.AutoMigrate(new(models.SysRole))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.Post)).Error
err = db.AutoMigrate(new(models.Post))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.DictData)).Error
err = db.AutoMigrate(new(models.DictData))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.DictType)).Error
err = db.AutoMigrate(new(models.DictType))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysJob)).Error
err = db.AutoMigrate(new(models.SysJob))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysConfig)).Error
err = db.AutoMigrate(new(models.SysConfig))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysSetting)).Error
err = db.AutoMigrate(new(models.SysSetting))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysFileDir)).Error
err = db.AutoMigrate(new(models.SysFileDir))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysCategory)).Error
err = db.AutoMigrate(new(models.SysCategory))
if err != nil {
return err
}
err = db.AutoMigrate(new(models.SysContent)).Error
err = db.AutoMigrate(new(models.SysContent))
if err != nil {
return err
}
@@ -98,6 +97,5 @@ func AutoMigrate(db *gorm.DB) error {
}
func CustomMigrate(db *gorm.DB, table interface{}) error {
db.SingularTable(true)
return db.AutoMigrate(&table).Error
return db.AutoMigrate(&table)
}
+2
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"go-admin/global"
"io/ioutil"
"log"
"strings"
)
@@ -32,6 +33,7 @@ func ExecSql(filePath string) error {
sql := strings.Replace(sqlList[i]+";", "\n", "", 0)
sql = strings.TrimSpace(sql)
if err = global.Eloquent.Exec(sql).Error; err != nil {
log.Printf("error sql: %s", sql)
if !strings.Contains(err.Error(), "Query was empty") {
return err
}
+2 -2
View File
@@ -59,13 +59,13 @@ func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int, error)
table = table.Where("userName = ?", e.Username)
}
var count int
var count int64
if err := table.Order("info_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *LoginLog) Create() (LoginLog, error) {
+2 -2
View File
@@ -71,13 +71,13 @@ func (e *SysOperLog) GetPage(pageSize int, pageIndex int) ([]SysOperLog, int, er
table = table.Where("business_type = ?", e.BusinessType)
}
var count int
var count int64
if err := table.Order("oper_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *SysOperLog) Create() (SysOperLog, error) {
+2 -2
View File
@@ -104,13 +104,13 @@ func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) {
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *Post) Update(id int) (update Post, err error) {
+3 -3
View File
@@ -56,13 +56,13 @@ func (role *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (role *SysRole) Get() (SysRole SysRole, err error) {
@@ -110,7 +110,7 @@ func (role *SysRole) GetRoleMeunId() ([]int, error) {
}
func (role *SysRole) Insert() (id int, err error) {
i := 0
var i int64
orm.Eloquent.Table(role.TableName()).Where("role_name=? or role_key = ?", role.RoleName, role.RoleKey).Count(&i)
if i > 0 {
return 0, errors.New("角色名称或者角色标识已经存在!")
+18 -34
View File
@@ -1,5 +1,3 @@
package models
import (
@@ -8,17 +6,16 @@ import (
)
type SysCategory struct {
Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` // 分类Id
Name string `json:"name" gorm:"type:varchar(255);"` // 名称
Img string `json:"img" gorm:"type:varchar(255);"` // 图片
Sort string `json:"sort" gorm:"type:int(4);"` // 排序
Status string `json:"status" gorm:"type:int(1);"` // 状态
Remark string `json:"remark" gorm:"type:varchar(255);"` // 备注
CreateBy string `json:"createBy" gorm:"type:varchar(64);"` // 创建者
UpdateBy string `json:"updateBy" gorm:"type:varchar(64);"` // 更新者
DataScope string `json:"dataScope" gorm:"-"`
Params string `json:"params" gorm:"-"`
Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` // 分类Id
Name string `json:"name" gorm:"type:varchar(255);"` // 名称
Img string `json:"img" gorm:"type:varchar(255);"` // 图片
Sort string `json:"sort" gorm:"type:int(4);"` // 排序
Status string `json:"status" gorm:"type:int(1);"` // 状态
Remark string `json:"remark" gorm:"type:varchar(255);"` // 备注
CreateBy string `json:"createBy" gorm:"type:varchar(64);"` // 创建者
UpdateBy string `json:"updateBy" gorm:"type:varchar(64);"` // 更新者
DataScope string `json:"dataScope" gorm:"-"`
Params string `json:"params" gorm:"-"`
BaseModel
}
@@ -38,35 +35,23 @@ func (e *SysCategory) Create() (SysCategory, error) {
return doc, nil
}
// 获取SysCategory
func (e *SysCategory) Get() (SysCategory, error) {
var doc SysCategory
table := orm.Eloquent.Table(e.TableName())
if e.Id != 0 {
table = table.Where("id = ?", e.Id)
}
if e.Name != "" {
if e.Name != "" {
table = table.Where("name = ?", e.Name)
}
if e.Status != "" {
if e.Status != "" {
table = table.Where("status = ?", e.Status)
}
if err := table.First(&doc).Error; err != nil {
return doc, err
}
@@ -79,29 +64,28 @@ func (e *SysCategory) GetPage(pageSize int, pageIndex int) ([]SysCategory, int,
table := orm.Eloquent.Select("*").Table(e.TableName())
if e.Name != "" {
if e.Name != "" {
table = table.Where("name = ?", e.Name)
}
if e.Status != "" {
if e.Status != "" {
table = table.Where("status = ?", e.Status)
}
// 数据权限控制(如果不需要数据权限请将此处去掉)
dataPermission := new(DataPermission)
dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
table,err := dataPermission.GetDataScope(e.TableName(), table)
table, err := dataPermission.GetDataScope(e.TableName(), table)
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
// 更新SysCategory
@@ -135,4 +119,4 @@ func (e *SysCategory) BatchDelete(id []int) (Result bool, err error) {
}
Result = true
return
}
}
+11 -11
View File
@@ -7,15 +7,15 @@ import (
type SysContent struct {
Id int `json:"id" gorm:"type:int(11);primary_key;auto_increment"` // id
CateId string `json:"cateId" gorm:"type:int(11);"` // 分类id
Name string `json:"name" gorm:"type:varchar(255);"` // 名称
Status string `json:"status" gorm:"type:int(1);"` // 状态
Img string `json:"img" gorm:"type:varchar(255);"` // 图片
Content string `json:"content" gorm:"type:text;"` // 内容
Remark string `json:"remark" gorm:"type:varchar(255);"` // 备注
Sort string `json:"sort" gorm:"type:int(4);"` // 排序
CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建者
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 更新者
CateId string `json:"cateId" gorm:"type:int(11);"` // 分类id
Name string `json:"name" gorm:"type:varchar(255);"` // 名称
Status string `json:"status" gorm:"type:int(1);"` // 状态
Img string `json:"img" gorm:"type:varchar(255);"` // 图片
Content string `json:"content" gorm:"type:text;"` // 内容
Remark string `json:"remark" gorm:"type:varchar(255);"` // 备注
Sort string `json:"sort" gorm:"type:int(4);"` // 排序
CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建者
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 更新者
DataScope string `json:"dataScope" gorm:"-"`
Params string `json:"params" gorm:"-"`
BaseModel
@@ -89,13 +89,13 @@ func (e *SysContent) GetPage(pageSize int, pageIndex int) ([]SysContent, int, er
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
// 更新SysContent
+11 -11
View File
@@ -7,15 +7,15 @@ import (
type SysFileInfo struct {
Id int `json:"id" gorm:"type:int(11);primary_key;AUTO_INCREMENT"` // id
Type string `json:"type" gorm:"type:varchar(255);"` // 文件类型
Name string `json:"name" gorm:"type:varchar(255);"` // 文件名称
Size string `json:"size" gorm:"type:int(11);"` // 文件大小
PId int `json:"pId" gorm:"type:int(11);"` // 目录id
Source string `json:"source" gorm:"type:varchar(255);"` // 文件源
Url string `json:"url" gorm:"type:varchar(255);"` // 文件路径
FullUrl string `json:"fullUrl" gorm:"type:varchar(255);"` // 文件全路径
CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建人
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 编辑人
Type string `json:"type" gorm:"type:varchar(255);"` // 文件类型
Name string `json:"name" gorm:"type:varchar(255);"` // 文件名称
Size string `json:"size" gorm:"type:int(11);"` // 文件大小
PId int `json:"pId" gorm:"type:int(11);"` // 目录id
Source string `json:"source" gorm:"type:varchar(255);"` // 文件源
Url string `json:"url" gorm:"type:varchar(255);"` // 文件路径
FullUrl string `json:"fullUrl" gorm:"type:varchar(255);"` // 文件全路径
CreateBy string `json:"createBy" gorm:"type:varchar(128);"` // 创建人
UpdateBy string `json:"updateBy" gorm:"type:varchar(128);"` // 编辑人
DataScope string `json:"dataScope" gorm:"-"`
Params string `json:"params" gorm:"-"`
BaseModel
@@ -69,13 +69,13 @@ func (e *SysFileInfo) GetPage(pageSize int, pageIndex int) ([]SysFileInfo, int,
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
// 更新SysFileInfo
+3 -3
View File
@@ -111,13 +111,13 @@ func (e *SysJob) GetPage(pageSize int, pageIndex int) ([]SysJob, int, error) {
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *SysJob) GetList() ([]SysJob, error) {
@@ -151,7 +151,7 @@ func (e *SysJob) RemoveAllEntryID() (update SysJob, err error) {
//参数1:是要修改的数据
//参数2:是修改的数据
if err = orm.Eloquent.Table(e.TableName()).Updates(map[string]interface{}{"entry_id": 0}).Error; err != nil {
if err = orm.Eloquent.Table(e.TableName()).Where("entry_id > ?", 0).Update("entry_id", 0).Error; err != nil {
return
}
return
+6 -6
View File
@@ -6,8 +6,8 @@ import (
type SysSetting struct {
SettingsId int `json:"settings_id" gorm:"primary_key;AUTO_INCREMENT"`
Name string `json:"name" gorm:"type:varchar(256);"`
Logo string `json:"logo" gorm:"type:varchar(256);"`
Name string `json:"name" gorm:"type:varchar(256);"`
Logo string `json:"logo" gorm:"type:varchar(256);"`
BaseModel
}
@@ -22,7 +22,7 @@ func (s *SysSetting) Get() (create SysSetting, err error) {
err = result.Error
return
}
return create,nil
return create, nil
}
//修改
@@ -34,6 +34,6 @@ func (s *SysSetting) Update() (update SysSetting, err error) {
}
type ResponseSystemConfig struct {
Name string `json:"name" binding:"required"` // 名称
Logo string `json:"logo" binding:"required"` // 头像
}
Name string `json:"name" binding:"required"` // 名称
Logo string `json:"logo" binding:"required"` // 头像
}
+4 -4
View File
@@ -2,10 +2,10 @@ package models
import (
"errors"
"log"
orm "go-admin/global"
"go-admin/tools"
"golang.org/x/crypto/bcrypt"
"log"
"strings"
)
@@ -220,13 +220,13 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, erro
if err != nil {
return nil, 0, err
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("sys_user.deleted_at IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
//加密
@@ -251,7 +251,7 @@ func (e SysUser) Insert() (id int, err error) {
}
// check 用户名
var count int
var count int64
orm.Eloquent.Table(e.TableName()).Where("username = ?", e.Username).Count(&count)
if count > 0 {
err = errors.New("账户已存在!")
+3 -3
View File
@@ -2,10 +2,10 @@ package tools
import (
"errors"
"github.com/jinzhu/gorm"
orm "go-admin/global"
"go-admin/tools"
config2 "go-admin/tools/config"
"gorm.io/gorm"
)
type DBColumns struct {
@@ -25,7 +25,7 @@ type DBColumns struct {
func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, error) {
var doc []DBColumns
var count int
var count int64
table := new(gorm.DB)
if config2.DatabaseConfig.Driver == "mysql" {
@@ -43,7 +43,7 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, erro
return nil, 0, err
}
table.Count(&count)
return doc, count, nil
return doc, int(count), nil
}
+3 -3
View File
@@ -2,10 +2,10 @@ package tools
import (
"errors"
"github.com/jinzhu/gorm"
orm "go-admin/global"
"go-admin/tools"
config2 "go-admin/tools/config"
"gorm.io/gorm"
)
type DBTables struct {
@@ -21,7 +21,7 @@ type DBTables struct {
func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) {
var doc []DBTables
table := new(gorm.DB)
var count int
var count int64
if config2.DatabaseConfig.Driver == "mysql" {
table = orm.Eloquent.Select("*").Table("information_schema.tables")
@@ -39,7 +39,7 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error)
}
table.Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *DBTables) Get() (DBTables, error) {
+2 -2
View File
@@ -61,13 +61,13 @@ func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, erro
table = table.Where("table_comment = ?", e.TableComment)
}
var count int
var count int64
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
return nil, 0, err
}
table.Where("`deleted_at` IS NULL").Count(&count)
return doc, count, nil
return doc, int(count), nil
}
func (e *SysTables) Get() (SysTables, error) {