Merge pull request #10925 from carlyin0801/issue_10924_atom_branch_ve…

…rsion_fix

bug:查插件环境信息接口未正确处理插件测试分支版本号情况 #10924

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
     }
 
     /**