feat: 红线支持指定到具体的步骤插件 TencentBlueKing#5405.

JamiKX1 · Feb 16, 2022 · 99af864 · 99af864
1 parent eb083aa
commit 99af864
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/...-quality/src/main/kotlin/com/tencent/devops/quality/service/v2/QualityIndicatorService.kt b/...-quality/src/main/kotlin/com/tencent/devops/quality/service/v2/QualityIndicatorService.kt
@@ -166,25 +166,18 @@ class QualityIndicatorService @Autowired constructor(
         enNameSet: Collection<String>,
         projectId: String? = null
     ): List<QualityIndicator> {
-        return if (enNameSet.isNotEmpty()) {
-            val tempProjectId = if (elementType == RunElementType.RUN.elementType) projectId else null
-            val indicatorRecords = indicatorDao.listByElementType(
-                dslContext = dslContext,
-                elementType = elementType,
-                type = null,
-                enNameSet = enNameSet,
-                projectId = tempProjectId
-            )
-            serviceListIndicatorRecord(indicatorRecords)
-        } else {
-            val indicatorRecords = indicatorDao.listByElementType(
-                dslContext = dslContext,
-                elementType = elementType,
-                type = null,
-                enNameSet = enNameSet
-            )
-            serviceListIndicatorRecord(indicatorRecords)
+        val tempProjectId = if (elementType == RunElementType.RUN.elementType) projectId else null
+        val indicatorRecords = indicatorDao.listByElementType(
+            dslContext = dslContext,
+            elementType = elementType,
+            type = null,
+            enNameSet = enNameSet,
+            projectId = tempProjectId
+        )?.associateBy { it.enName }
+        val allIndicatorRecords = enNameSet.map {
+            indicatorRecords?.get(it) ?: throw OperationException("indicator id $it is not exist")
         }
+        return serviceListIndicatorRecord(allIndicatorRecords)
     }
 
     fun serviceListFilterBash(elementType: String, enNameSet: Collection<String>): List<QualityIndicator> {