Merge pull request TencentBlueKing#10931 from yongyiduan/pac_20240909…

…1930 feat：流水线版本管理机制 TencentBlueKing#8161 优化互斥组互转
fcfang123 · Sep 11, 2024 · e9fc322 · e9fc322
2 parents e0a9062 + 8f39b80
commit e9fc322
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...peline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt b/...peline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/ContainerTransfer.kt
@@ -415,11 +415,11 @@ class ContainerTransfer @Autowired(required = false) constructor(
     }
 
     private fun getMutexYaml(resource: MutexGroup?): Mutex? {
-        if (resource?.mutexGroupName.isNullOrBlank()) {
+        if (resource?.mutexGroupName.isNullOrBlank() || resource?.enable != true) {
             return null
         }
         return Mutex(
-            label = resource?.mutexGroupName!!,
+            label = resource.mutexGroupName!!,
             queueLength = if (resource.queueEnable) {
                 resource.queue
             } else {