fix collaboration mode name duplicate problem

Signed-off-by: Min Min <[email protected]>
koderover · Dec 3, 2024 · 3ee80a1 · 3ee80a1
1 parent 92e5bd8
commit 3ee80a1
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/pkg/microservice/aslan/core/collaboration/service/collaboration_instance.go b/pkg/microservice/aslan/core/collaboration/service/collaboration_instance.go
@@ -260,13 +260,9 @@ func getDiff(cmMap map[string]*models.CollaborationMode, ciMap map[string]*model
 	var deleteItems []models.CollaborationInstance
 	for name, cm := range cmMap {
 		if ci, ok := ciMap[name]; ok {
-			if cm.Revision < ci.Revision {
-				return nil, fmt.Errorf("CollaborationMode:%s revision error", name)
-			} else if cm.Revision > ci.Revision {
-				updateItems = append(updateItems, getUpdateDiff(cm, ci))
-				instance := genCollaborationInstance(*cm, projectName, uid, identityType, userName)
-				updateInstance = append(updateInstance, *instance)
-			}
+			updateItems = append(updateItems, getUpdateDiff(cm, ci))
+			instance := genCollaborationInstance(*cm, projectName, uid, identityType, userName)
+			updateInstance = append(updateInstance, *instance)
 		} else {
 			newItems = append(newItems, *cm)
 		}