From 911166152a2190d6678f9bdc37c416768ca2225d Mon Sep 17 00:00:00 2001 From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com> Date: Wed, 7 Jun 2023 19:09:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20MYSQL=20=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8D=87=E7=BA=A7=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#1283)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/app_install.go | 3 +++ backend/app/service/app_utils.go | 3 +++ 2 files changed, 6 insertions(+) diff --git a/backend/app/service/app_install.go b/backend/app/service/app_install.go index 1894ce065..8df81e823 100644 --- a/backend/app/service/app_install.go +++ b/backend/app/service/app_install.go @@ -413,6 +413,9 @@ func (a *AppInstallService) GetUpdateVersions(installId uint) ([]dto.AppVersion, return versions, err } for _, detail := range details { + if common.IsCrossVersion(install.Version, detail.Version) && !app.CrossVersionUpdate { + continue + } if common.CompareVersion(detail.Version, install.Version) { versions = append(versions, dto.AppVersion{ Version: detail.Version, diff --git a/backend/app/service/app_utils.go b/backend/app/service/app_utils.go index 8231ff50a..3d97a8ee9 100644 --- a/backend/app/service/app_utils.go +++ b/backend/app/service/app_utils.go @@ -768,6 +768,9 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool) ([]respons } var versions []string for _, detail := range details { + if common.IsCrossVersion(installed.Version, detail.Version) && !app.CrossVersionUpdate { + continue + } versions = append(versions, detail.Version) } versions = common.GetSortedVersions(versions)