From d27685a4bf2b837a370fc07f21e2cfb2656d361c Mon Sep 17 00:00:00 2001
From: carlyin-tx <449036249@qq.com>
Date: Fri, 6 Sep 2024 20:31:33 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E6=9F=A5=E6=8F=92=E4=BB=B6=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=9C=AA=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E5=A4=84=E7=90=86=E6=8F=92=E4=BB=B6=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E7=89=88=E6=9C=AC=E5=8F=B7=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=20#10924?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MarketAtomEnvServiceImpl.kt  | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomEnvServiceImpl.kt b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomEnvServiceImpl.kt
index 834664b9fdf..958f018f5c3 100644
--- a/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomEnvServiceImpl.kt
+++ b/src/backend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/atom/service/impl/MarketAtomEnvServiceImpl.kt
@@ -415,33 +415,30 @@ class MarketAtomEnvServiceImpl @Autowired constructor(
         normalStatusList: List<Byte>,
         atomCode: String,
         projectCode: String
-    ): List<Byte>? {
-        var atomStatusList: List<Byte>? = null
-        if (atomStatus != null) {
+    ): List<Byte> {
+        return if (atomStatus != null) {
             mutableListOf(atomStatus)
         } else {
-            if (VersionUtils.isLatestVersion(version)) {
-                atomStatusList = normalStatusList.toMutableList()
-                val releaseCount = marketAtomDao.countReleaseAtomByCode(dslContext, atomCode, version)
-                if (releaseCount > 0) {
-                    // 如果当前大版本内还有已发布的版本，则xx.latest只对应最新已发布的版本
-                    atomStatusList = mutableListOf(AtomStatusEnum.RELEASED.status.toByte())
+            normalStatusList.toMutableList().apply {
+                if (VersionUtils.isLatestVersion(version)) {
+                    val releaseCount = marketAtomDao.countReleaseAtomByCode(dslContext, atomCode, version)
+                    if (releaseCount > 0) {
+                        // 如果当前大版本内还有已发布的版本，则xx.latest只对应最新已发布的版本
+                        this.clear()
+                        this.add(AtomStatusEnum.RELEASED.status.toByte())
+                    }
                 }
-                val flag =
-                    storeProjectRelDao.isTestProjectCode(dslContext, atomCode, StoreTypeEnum.ATOM, projectCode)
-                logger.info("isInitTestProjectCode flag is :$flag")
+                val flag = storeProjectRelDao.isTestProjectCode(dslContext, atomCode, StoreTypeEnum.ATOM, projectCode)
                 if (flag) {
-                    // 原生项目或者调试项目有权查处于测试中、审核中的插件
-                    atomStatusList.addAll(
+                    // 初始化项目或者调试项目有权查处于测试中、审核中的插件
+                    this.addAll(
                         listOf(
-                            AtomStatusEnum.TESTING.status.toByte(),
-                            AtomStatusEnum.AUDITING.status.toByte()
+                            AtomStatusEnum.TESTING.status.toByte(), AtomStatusEnum.AUDITING.status.toByte()
                         )
                     )
                 }
             }
         }
-        return atomStatusList
     }
 
     /**