mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-28 21:39:06 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix: 解决启动之后报错的BUG

Browse Source
This commit is contained in:
zhengkunwang223 2023-03-02 18:47:48 +08:00
parent ae295794d3
commit decb4bb16b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/app/repo/app_install.go
View File

@ -62,17 +62,14 @@ func (a *AppInstallRepo) WithIdNotInWebsite() DBOption {
func (a *AppInstallRepo) ListBy(opts ...DBOption) ([]model.AppInstall, error) { func (a *AppInstallRepo) ListBy(opts ...DBOption) ([]model.AppInstall, error) {
var install []model.AppInstall var install []model.AppInstall
db := getDb(opts...).Model(&model.AppInstall{}) db := getDb(opts...).Model(&model.AppInstall{})
err := db.Preload("App").Preload("Backups").Find(&install).Error err := db.Preload("App").Find(&install).Error
return install, err return install, err
} }
func (a *AppInstallRepo) GetFirst(opts ...DBOption) (model.AppInstall, error) { func (a *AppInstallRepo) GetFirst(opts ...DBOption) (model.AppInstall, error) {
var install model.AppInstall var install model.AppInstall
db := getDb(opts...).Model(&model.AppInstall{}) db := getDb(opts...).Model(&model.AppInstall{})
err := db.Preload("App").Preload("Backups", func(db *gorm.DB) *gorm.DB { err := db.Preload("App").First(&install).Error
db = db.Order("created_at desc")
return db
}).First(&install).Error
return install, err return install, err
} }
@ -99,7 +96,7 @@ func (a *AppInstallRepo) Page(page, size int, opts ...DBOption) (int64, []model.
db := getDb(opts...).Model(&model.AppInstall{}) db := getDb(opts...).Model(&model.AppInstall{})
count := int64(0) count := int64(0)
db = db.Count(&count) db = db.Count(&count)
err := db.Limit(size).Offset(size * (page - 1)).Preload("App").Preload("Backups").Find(&apps).Error err := db.Limit(size).Offset(size * (page - 1)).Preload("App").Find(&apps).Error
return count, apps, err return count, apps, err
} }