Conversation
新增RoleBasicDto和RoleDetailByCodeQuery,实现通过角色Code获取基础信息。完善QueryHandler和RoleService相关逻辑,并统一版权声明。
移除了RoleBasicDto类中将Name和Code初始化为空字符串的无参构造函数,仅保留带参数的构造函数。此更改有助于避免属性被默认初始化为无意义的空字符串。
将 Staff.SetCurrentTeam 方法参数类型由 Guid 改为 Guid?,并在清除当前团队时传入 null,提升对无团队状态的支持。
Qinyouzeng
approved these changes
Jan 28, 2026
There was a problem hiding this comment.
Pull request overview
This PR fixes a foreign key constraint violation that occurred when attempting to clear a staff member's current team during LDAP synchronization. The root cause was using Guid.Empty instead of null to clear the CurrentTeamId, which violated the FK constraint since no Team with ID 00000000-0000-0000-0000-000000000000 exists.
Changes:
- Updated
SetCurrentTeammethod to accept nullableGuid?parameter instead of non-nullableGuid - Changed the LDAP sync logic to pass
nullinstead ofGuid.Emptywhen clearing a staff's current team
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/Domain/Masa.Auth.Domain/Subjects/Aggregates/Staff.cs | Modified SetCurrentTeam method signature to accept Guid? instead of Guid, allowing null values for clearing the current team |
| src/Services/Masa.Auth.Service.Admin/Application/Subjects/StaffCommandHandler.cs | Updated LDAP sync logic to pass null instead of Guid.Empty when disabling users and clearing their team assignments |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fix:insert or update on table "Staff" violates foreign key constraint "FK_Staff_Team_CurrentTeamId"