diff --git a/app/common/dao/pkg.go b/app/common/dao/pkg.go index fabd024..01a1abc 100644 --- a/app/common/dao/pkg.go +++ b/app/common/dao/pkg.go @@ -37,7 +37,7 @@ func (p *Pkg) Delete(m *model.Pkg) error { func (p *Pkg) Get(id int64) (*model.Pkg, error) { var res model.Pkg - if err := p.db.Table(p.TableName()).Where("id = ?", id).First(&res).Error; err != nil { + if err := p.db.Table(p.TableName()).Where("id = ?", id).Where("status = ?", model.PkgNormal).First(&res).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return nil, nil } @@ -49,7 +49,7 @@ func (p *Pkg) Get(id int64) (*model.Pkg, error) { func (p *Pkg) GetByPkgName(name string) (*model.Pkg, error) { var res model.Pkg - tx := p.db.Table(p.TableName()) + tx := p.db.Table(p.TableName()).Where("status = ?", model.PkgNormal) if name != "" { tx = tx.Where("name = ?", name) } @@ -65,7 +65,7 @@ func (p *Pkg) GetByPkgName(name string) (*model.Pkg, error) { func (p *Pkg) GetOne(name, version string) (*model.Pkg, error) { var res model.Pkg - tx := p.db.Table(p.TableName()) + tx := p.db.Table(p.TableName()).Where("status = ?", model.PkgNormal) if name != "" { tx = tx.Where("name = ? AND version = ?", name, version) } @@ -87,6 +87,7 @@ func (p *Pkg) GetUserPkg(userId int64, pkg, version string) (*model.Pkg, error) tx = tx.Where("u.user_id = ?", userId) tx = tx.Where("p.name = ? ", pkg) tx = tx.Where("p.version = ?", version) + tx = tx.Where("p.status = ?", model.PkgNormal) if err := tx.Select("u.*,p.*").Find(&res).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return nil, nil diff --git a/app/common/dao/user_pkg.go b/app/common/dao/user_pkg.go index ad8a134..4bc5e18 100644 --- a/app/common/dao/user_pkg.go +++ b/app/common/dao/user_pkg.go @@ -49,6 +49,7 @@ func (p *UserPkg) GetLatest(userId int64) (*model.UserPkgInfo, error) { tx = tx.Joins(fmt.Sprintf(" JOIN %s p ON u.package_id = p.id", NewPackage().TableName())) tx = tx.Where("u.user_id = ?", userId) tx = tx.Order("u.id desc") + tx = tx.Where("p.status = ?", model.PkgNormal) if err := tx.Select("u.*,p.*").Limit(1).Find(&res).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return nil, nil