fix: check user is-existed when add member (#4035)

* check user is-existed when add member * make migration to delete dirty data
erda-project · Feb 18, 2022 · e8b21da · e8b21da
1 parent aed13e1
commit e8b21da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.erda/migrations/cmdb/20220214-delete-empty-userid-member.sql b/.erda/migrations/cmdb/20220214-delete-empty-userid-member.sql
@@ -0,0 +1,2 @@
+DELETE FROM dice_member WHERE user_id = '';
+DELETE FROM dice_member_extra WHERE user_id = '';
diff --git a/pkg/ucauth/user_admin.go b/pkg/ucauth/user_admin.go
@@ -342,7 +342,11 @@ func (c *UCClient) findUsersByQuery(query string, idOrder ...string) ([]User, er
 		}
 		var orderedUsers []User
 		for _, id := range idOrder {
-			orderedUsers = append(orderedUsers, userMap[id])
+			user, ok := userMap[id]
+			if !ok {
+				return nil, fmt.Errorf("failed to find user by id: %s", id)
+			}
+			orderedUsers = append(orderedUsers, user)
 		}
 		return orderedUsers, nil
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		DELETE FROM dice_member WHERE user_id = '';
		DELETE FROM dice_member_extra WHERE user_id = '';