修复 「1.2.2 用户管理-用户列表勾选单一用户会全选 」 close #216
This commit is contained in:
@ -1,24 +1,19 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"next-terminal/server/model"
|
||||
"context"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"next-terminal/server/model"
|
||||
)
|
||||
|
||||
type StorageRepository struct {
|
||||
DB *gorm.DB
|
||||
type storageRepository struct {
|
||||
baseRepository
|
||||
}
|
||||
|
||||
func NewStorageRepository(db *gorm.DB) *StorageRepository {
|
||||
storageRepository = &StorageRepository{DB: db}
|
||||
return storageRepository
|
||||
}
|
||||
|
||||
func (r StorageRepository) Find(pageIndex, pageSize int, name, order, field string) (o []model.StorageForPage, total int64, err error) {
|
||||
func (r storageRepository) Find(c context.Context, pageIndex, pageSize int, name, order, field string) (o []model.StorageForPage, total int64, err error) {
|
||||
m := model.Storage{}
|
||||
db := r.DB.Table(m.TableName()).Select("storages.id,storages.name,storages.is_share,storages.limit_size,storages.is_default,storages.owner,storages.created, users.nickname as owner_name").Joins("left join users on storages.owner = users.id")
|
||||
dbCounter := r.DB.Table(m.TableName())
|
||||
db := r.GetDB(c).Table(m.TableName()).Select("storages.id,storages.name,storages.is_share,storages.limit_size,storages.is_default,storages.owner,storages.created, users.nickname as owner_name").Joins("left join users on storages.owner = users.id")
|
||||
dbCounter := r.GetDB(c).Table(m.TableName())
|
||||
|
||||
if len(name) > 0 {
|
||||
db = db.Where("name like ?", "%"+name+"%")
|
||||
@ -49,37 +44,37 @@ func (r StorageRepository) Find(pageIndex, pageSize int, name, order, field stri
|
||||
return
|
||||
}
|
||||
|
||||
func (r StorageRepository) FindShares() (o []model.Storage, err error) {
|
||||
func (r storageRepository) FindShares(c context.Context) (o []model.Storage, err error) {
|
||||
m := model.Storage{}
|
||||
db := r.DB.Table(m.TableName()).Where("is_share = 1")
|
||||
db := r.GetDB(c).Table(m.TableName()).Where("is_share = 1")
|
||||
err = db.Find(&o).Error
|
||||
return
|
||||
}
|
||||
|
||||
func (r StorageRepository) DeleteById(id string) error {
|
||||
return r.DB.Where("id = ?", id).Delete(model.Storage{}).Error
|
||||
func (r storageRepository) DeleteById(c context.Context, id string) error {
|
||||
return r.GetDB(c).Where("id = ?", id).Delete(model.Storage{}).Error
|
||||
}
|
||||
|
||||
func (r StorageRepository) Create(m *model.Storage) error {
|
||||
return r.DB.Create(m).Error
|
||||
func (r storageRepository) Create(c context.Context, m *model.Storage) error {
|
||||
return r.GetDB(c).Create(m).Error
|
||||
}
|
||||
|
||||
func (r StorageRepository) UpdateById(o *model.Storage, id string) error {
|
||||
func (r storageRepository) UpdateById(c context.Context, o *model.Storage, id string) error {
|
||||
o.ID = id
|
||||
return r.DB.Updates(o).Error
|
||||
return r.GetDB(c).Updates(o).Error
|
||||
}
|
||||
|
||||
func (r StorageRepository) FindByOwnerIdAndDefault(owner string, isDefault bool) (m model.Storage, err error) {
|
||||
err = r.DB.Where("owner = ? and is_default = ?", owner, isDefault).First(&m).Error
|
||||
func (r storageRepository) FindByOwnerIdAndDefault(c context.Context, owner string, isDefault bool) (m model.Storage, err error) {
|
||||
err = r.GetDB(c).Where("owner = ? and is_default = ?", owner, isDefault).First(&m).Error
|
||||
return
|
||||
}
|
||||
|
||||
func (r StorageRepository) FindById(id string) (m model.Storage, err error) {
|
||||
err = r.DB.Where("id = ?", id).First(&m).Error
|
||||
func (r storageRepository) FindById(c context.Context, id string) (m model.Storage, err error) {
|
||||
err = r.GetDB(c).Where("id = ?", id).First(&m).Error
|
||||
return
|
||||
}
|
||||
|
||||
func (r StorageRepository) FindAll() (o []model.Storage, err error) {
|
||||
err = r.DB.Find(&o).Error
|
||||
func (r storageRepository) FindAll(c context.Context) (o []model.Storage, err error) {
|
||||
err = r.GetDB(c).Find(&o).Error
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user