From 9cb1a4989b412a8a0d5d6745e6302e54c41dfebf Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期二, 21 五月 2024 11:49:09 +0800 Subject: [PATCH] 修复统计条数没过滤软删除的问题 --- request/audio.go | 10 +++++----- models/audio_text.go | 4 ++-- models/train.go | 4 ++-- models/audio.go | 4 ++-- models/text.go | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/models/audio.go b/models/audio.go index 76fac0c..96f52a2 100644 --- a/models/audio.go +++ b/models/audio.go @@ -271,7 +271,7 @@ db = slf.build() ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, int(total), fmt.Errorf("find count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { @@ -308,7 +308,7 @@ db = slf.Orm.Table(slf.TableName()).Where(query, args...) ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, total, fmt.Errorf("find by query count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { diff --git a/models/audio_text.go b/models/audio_text.go index 3e5d4b2..611d75c 100644 --- a/models/audio_text.go +++ b/models/audio_text.go @@ -160,7 +160,7 @@ db = slf.build() ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, int(total), fmt.Errorf("find count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { @@ -197,7 +197,7 @@ db = slf.Orm.Table(slf.TableName()).Where(query, args...) ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, total, fmt.Errorf("find by query count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { diff --git a/models/text.go b/models/text.go index bd9360a..cc4d724 100644 --- a/models/text.go +++ b/models/text.go @@ -190,7 +190,7 @@ db = slf.build() ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, int(total), fmt.Errorf("find count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { @@ -227,7 +227,7 @@ db = slf.Orm.Table(slf.TableName()).Where(query, args...) ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, total, fmt.Errorf("find by query count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { diff --git a/models/train.go b/models/train.go index 3031015..be72a19 100644 --- a/models/train.go +++ b/models/train.go @@ -201,7 +201,7 @@ db = slf.build() ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, int(total), fmt.Errorf("find count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { @@ -238,7 +238,7 @@ db = slf.Orm.Table(slf.TableName()).Where(query, args...) ) - if err := db.Count(&total).Error; err != nil { + if err := db.Where("deleted_at IS NULL").Count(&total).Error; err != nil { return records, total, fmt.Errorf("find by query count err: %v", err) } if slf.PageNum*slf.PageSize > 0 { diff --git a/request/audio.go b/request/audio.go index be4cdc0..d5b59df 100644 --- a/request/audio.go +++ b/request/audio.go @@ -7,14 +7,14 @@ type GetAudioList struct { PageInfo - Keyword string `form:"keyword"` // 鍏抽敭瀛� + Keyword string `form:"keyword"` // 鍏抽敭瀛� LocomotiveNumber string `gorm:"index;type:varchar(255);not null;default:'';comment:鏈鸿溅鍙�" form:"locomotiveNumber"` // 鏈鸿溅鍙� - TrainNumber string `gorm:"index;type:varchar(255);not null;default:'';comment:杞︽" form:"trainNumber"` // 杞︽ + TrainNumber string `gorm:"index;type:varchar(255);not null;default:'';comment:杞︽" form:"trainNumber"` // 杞︽ DriverNumber string `gorm:"index;type:varchar(255);not null;default:'';comment:鍙告満鍙�" form:"driverNumber"` // 鍙告満鍙� StationNumber string `gorm:"index;type:varchar(255);not null;default:'';comment:杞︾珯鍙�" form:"stationNumber"` // 杞︾珯鍙� - BeginTime time.Time `form:"beginTime"` //寮�濮嬫椂闂� - EndTime time.Time `form:"endTime"` //缁撴潫鏃堕棿 - IsFollowed constvar.BoolType `form:"isFollowed"` //鏄惁鍏虫敞 1鍏虫敞 2鏈叧娉� + BeginTime time.Time `form:"beginTime"` //寮�濮嬫椂闂� + EndTime time.Time `form:"endTime"` //缁撴潫鏃堕棿 + IsFollowed constvar.BoolType `form:"isFollowed"` //鏄惁鍏虫敞 1鍏虫敞 2鏈叧娉� } type ProcessAudio struct { -- Gitblit v1.8.0