fix: this.resolve skipSelf should not skip for different id or import

fix: this.resolve skipSelf should not skip for different id or import #22385