diff --git a/.erda/migrations/cmdb/20220214-delete-empty-userid-member.sql b/.erda/migrations/cmdb/20220214-delete-empty-userid-member.sql new file mode 100644 index 00000000000..735a79f0cb7 --- /dev/null +++ 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 = ''; \ No newline at end of file diff --git a/pkg/ucauth/user_admin.go b/pkg/ucauth/user_admin.go index 3935c865e66..d59aefb6485 100644 --- 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 }