From 395bc6394640f7012994c58dc573a7b020d125a2 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Wed, 8 May 2024 18:44:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BD=91=E7=AB=99?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E6=81=A2=E5=A4=8D=E5=AF=BC=E8=87=B4=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E5=88=97=E8=A1=A8=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#4924)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/backup_website.go | 6 +++--- frontend/src/views/website/runtime/php/edit/index.vue | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/app/service/backup_website.go b/backend/app/service/backup_website.go index 36f7f14e1..e3461d7bd 100644 --- a/backend/app/service/backup_website.go +++ b/backend/app/service/backup_website.go @@ -250,18 +250,18 @@ func checkValidOfWebsite(oldWebsite, website *model.Website) error { return buserr.WithDetail(constant.ErrBackupMatch, fmt.Sprintf("oldName: %s, oldType: %v", oldWebsite.Alias, oldWebsite.Type), nil) } if oldWebsite.AppInstallID != 0 { - _, err := appInstallRepo.GetFirst(commonRepo.WithByID(website.AppInstallID)) + _, err := appInstallRepo.GetFirst(commonRepo.WithByID(oldWebsite.AppInstallID)) if err != nil { return buserr.WithDetail(constant.ErrBackupMatch, "app", nil) } } if oldWebsite.RuntimeID != 0 { - if _, err := runtimeRepo.GetFirst(commonRepo.WithByID(website.RuntimeID)); err != nil { + if _, err := runtimeRepo.GetFirst(commonRepo.WithByID(oldWebsite.RuntimeID)); err != nil { return buserr.WithDetail(constant.ErrBackupMatch, "runtime", nil) } } if oldWebsite.WebsiteSSLID != 0 { - if _, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(website.WebsiteSSLID)); err != nil { + if _, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(oldWebsite.WebsiteSSLID)); err != nil { return buserr.WithDetail(constant.ErrBackupMatch, "ssl", nil) } } diff --git a/frontend/src/views/website/runtime/php/edit/index.vue b/frontend/src/views/website/runtime/php/edit/index.vue index 2fca7cefc..220e01362 100644 --- a/frontend/src/views/website/runtime/php/edit/index.vue +++ b/frontend/src/views/website/runtime/php/edit/index.vue @@ -9,6 +9,7 @@ allow-create default-first-option @change="updateParam" + clearable >