public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-10-03 22:07:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/wenjianzhang/go-admin into dev

Browse Source
This commit is contained in:
zhangwenjian
2020-08-28 00:06:55 +08:00
parent c69a7d9fd9 5db1495985
commit 1dffcb7199
6 changed files with 101 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/sysjob.go
+26 -24
View File
@@ -75,34 +75,37 @@ func (e *SysJob) Get() (SysJob, error) {
}
// 获取SysJob带分页
func (e *SysJob) GetPage(pageSize int, pageIndex int) ([]SysJob, int, error) {
func (e *SysJob) GetPage(pageSize int, pageIndex int, v interface{}) ([]SysJob, int, error) {
var doc []SysJob
//table := orm.Eloquent.Select("*").Table(e.TableName())
table := orm.Eloquent.Table(e.TableName())
if e.JobId != 0 {
table = table.Where("job_id = ?", e.JobId)
}
table = tools.SetQuery(table, v)
if e.JobName != "" {
table = table.Where("job_name like ?", "%"+e.JobName+"%")
}
if e.JobGroup != "" {
table = table.Where("job_group = ?", e.JobGroup)
}
if e.CronExpression != "" {
table = table.Where("cron_expression = ?", e.CronExpression)
}
if e.InvokeTarget != "" {
table = table.Where("invoke_target = ?", e.InvokeTarget)
}
if e.Status != 0 {
table = table.Where("status = ?", e.Status)
}
//if e.JobId != 0 {
// table = table.Where("job_id = ?", e.JobId)
//}
//
//if e.JobName != "" {
// table = table.Where("job_name like ?", "%"+e.JobName+"%")
//}
//
//if e.JobGroup != "" {
// table = table.Where("job_group = ?", e.JobGroup)
//}
//
//if e.CronExpression != "" {
// table = table.Where("cron_expression = ?", e.CronExpression)
//}
//
//if e.InvokeTarget != "" {
// table = table.Where("invoke_target = ?", e.InvokeTarget)
//}
//
//if e.Status != 0 {
// table = table.Where("status = ?", e.Status)
//}
// 数据权限控制(如果不需要数据权限请将此处去掉)
dataPermission := new(DataPermission)
@@ -116,7 +119,6 @@ func (e *SysJob) GetPage(pageSize int, pageIndex int) ([]SysJob, int, error) {
if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
return nil, 0, err
}
//table.Where("`deleted_at` IS NULL").Count(&count)
return doc, int(count), nil
}