Skip to content

chore(user): set default BusinessWritePermission for system admins in… #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iwanghc merged 1 commit into from
May 12, 2026
Merged

chore(user): set default BusinessWritePermission for system admins in… #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/dms/biz/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ type User struct {
LastLoginAt time.Time
// 用户是否被删除
Deleted bool
// 业务写权开关，默认 true；为 false 时系统管理员/admin 不通过全局身份放行业务写操作
// 业务写权开关，为 false 时系统管理员/admin 不通过全局身份放行业务写操作
BusinessWritePermission bool
}

Expand Down Expand Up @@ -506,7 +506,7 @@ type CreateUserArgs struct {
OpPermissionUIDs []string
UserAuthenticationType UserAuthenticationType
System UserSystem
BusinessWritePermission *bool // nil means use default (true)
BusinessWritePermission *bool
}

func (d *UserUsecase) AddUser(ctx context.Context, currentUserUid string, args *CreateUserArgs) (uid string, err error) {
Expand Down Expand Up @@ -885,8 +885,8 @@ func (d *UserUsecase) UpdateUser(ctx context.Context, currentUserUid string, arg
user.BusinessWritePermission = *args.BusinessWritePermission
}
} else {
// User is not system administrator: always reset BWP to true
user.BusinessWritePermission = true
// User is not system administrator: always reset BWP to flase
user.BusinessWritePermission = false
}
}

Expand Down
13 changes: 12 additions & 1 deletion internal/dms/service/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@ func (d *DMSService) AddUser(ctx context.Context, currentUserUid string, req *dm
defer func() {
d.log.Infof("AddUsers.req=%v;reply=%v;error=%v", req, reply, err)
}()
// 如果 BusinessWritePermission 为 nil，如果为系统管理员权限，默认有业务写权限
businessWritePermission := req.User.BusinessWritePermission
if businessWritePermission == nil {
for _, uid := range req.User.OpPermissionUids {
if uid == pkgConst.UIDOfOpPermissionGlobalManagement {
t := true
businessWritePermission = &t
break
}
}
}

args := &biz.CreateUserArgs{
UID: req.User.UID,
Expand All @@ -111,7 +122,7 @@ func (d *DMSService) AddUser(ctx context.Context, currentUserUid string, req *dm
ThirdPartyUserID: req.User.ThirdPartyUserID,
ThirdPartyUserInfo: req.User.ThirdPartyUserInfo,
UserAuthenticationType: biz.UserAuthenticationType(req.User.UserAuthenticationType),
BusinessWritePermission: req.User.BusinessWritePermission,
BusinessWritePermission: businessWritePermission,
}

uid, err := d.UserUsecase.AddUser(ctx, currentUserUid, args)
Expand Down