wangfuduo
/
twin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: get pkg use status filter

This commit is contained in:
wangfuduo 2026-07-07 16:49:00 +08:00
parent e2f18c566e
commit 503a4adba9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/dao/pkg.go
View File

@ -37,7 +37,7 @@ func (p *Pkg) Delete(m *model.Pkg) error {
func (p *Pkg) Get(id int64) (*model.Pkg, error) { func (p *Pkg) Get(id int64) (*model.Pkg, error) {
var res model.Pkg 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) { if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil 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) { func (p *Pkg) GetByPkgName(name string) (*model.Pkg, error) {
var res model.Pkg var res model.Pkg
tx := p.db.Table(p.TableName()) tx := p.db.Table(p.TableName()).Where("status = ?", model.PkgNormal)
if name != "" { if name != "" {
tx = tx.Where("name = ?", 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) { func (p *Pkg) GetOne(name, version string) (*model.Pkg, error) {
var res model.Pkg var res model.Pkg
tx := p.db.Table(p.TableName()) tx := p.db.Table(p.TableName()).Where("status = ?", model.PkgNormal)
if name != "" { if name != "" {
tx = tx.Where("name = ? AND version = ?", name, version) 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("u.user_id = ?", userId)
tx = tx.Where("p.name = ? ", pkg) tx = tx.Where("p.name = ? ", pkg)
tx = tx.Where("p.version = ?", version) 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 err := tx.Select("u.*,p.*").Find(&res).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil return nil, nil

1
app/common/dao/user_pkg.go
View File

@ -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.Joins(fmt.Sprintf(" JOIN %s p ON u.package_id = p.id", NewPackage().TableName()))
tx = tx.Where("u.user_id = ?", userId) tx = tx.Where("u.user_id = ?", userId)
tx = tx.Order("u.id desc") 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 err := tx.Select("u.*,p.*").Limit(1).Find(&res).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) { if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil return nil, nil