diff --git a/apps/common/auth/handle/impl/user_token.py b/apps/common/auth/handle/impl/user_token.py index 5f66ee42897..9c025066b6f 100644 --- a/apps/common/auth/handle/impl/user_token.py +++ b/apps/common/auth/handle/impl/user_token.py @@ -110,7 +110,7 @@ def get_permissions( for role_id in role_ids: for m in role_permission_mapping_dict.get(str(role_id)) or []: p = PERMISSION_STR_MAP.get(m.permission_id) - if p is not None and PermissionScopeConstants.WORKSPACE in p.meta.scope: + if PermissionScopeConstants.WORKSPACE in p.meta.scope: permissions.append(p) for group, ps in group_by(permissions, lambda p: p.meta.group).items(): diff --git a/apps/common/auth/struct/permission.py b/apps/common/auth/struct/permission.py index 8f0e93148d4..5f3de1bac59 100644 --- a/apps/common/auth/struct/permission.py +++ b/apps/common/auth/struct/permission.py @@ -42,7 +42,8 @@ def get_resource_permission_key(self, resource_id): def __str__(self): sub = f"_{self.sub_group}" if self.sub_group != self.group else "" flag = f"_{self.flag}" if self.flag else "" - return f"{self.group}{sub}_{self.operate}{flag}" + operate = f":{self.operate}" if self.operate else "" + return f"{self.group}{sub}{operate}{flag}" @dataclass