feat(permission): replace OA roles with post-bound roles and assignee posts

Unify effective roles via post-role bindings, remove dedicated OA role UI, and update OA assignee resolution plus related SQL/docs.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zlwuandCursor committed 2026-08-04 17:41:04 +08:00
1 parent a3c73d76bb
commit 06db3bc966
66 files changed
+55337 -38647

No files matched your search

+40
View File
@@ -1046,6 +1046,46 @@ async def update_post_bound_users(
return error_response(400, str(e))
class PostRolesUpdateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
role_ids: List[str] = Field(default_factory=list, alias="roleIds")
@router.get("/posts/{post_id}/roles")
async def list_post_bound_roles(
post_id: str,
user: dict = Depends(require_menu_code("system:post:list")),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
post = post_svc.get_post(db, post_id)
if not post or post.tenant_no != tenant_no:
return error_response(404, "职位不存在")
ids = post_svc.list_role_ids_for_post(db, post_id, tenant_no)
return success_response({"roleIds": ids})
@router.put("/posts/{post_id}/roles")
async def update_post_bound_roles(
post_id: str,
body: PostRolesUpdateBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
post = post_svc.get_post(db, post_id)
if not post or post.tenant_no != tenant_no:
return error_response(404, "职位不存在")
try:
post_svc.sync_post_role_bindings(
db, post_id, tenant_no, body.role_ids, user.get("user_id")
)
return success_response(None, message="保存成功")
except ValueError as e:
return error_response(400, str(e))
# ---------------------------------------------------------------------------
# 物品单位管理
# ---------------------------------------------------------------------------
-7
View File
@@ -870,13 +870,6 @@ STATIC_MENU_TREE = [
"component": "/oa-approval/apps/index",
"meta": {"title": "审批管理", "keepAlive": True, "menuCode": "oa:apps:list"},
},
{
"id": "OA000000000000000000000000000102",
"name": "OaApprovalRoles",
"path": "roles",
"component": "/oa-approval/roles/index",
"meta": {"title": "工作流角色", "keepAlive": True, "menuCode": "oa:roles:list"},
},
{
"id": "OA000000000000000000000000000103",
"name": "OaApprovalStart",
+23 -150
View File
@@ -28,156 +28,6 @@ def _get_tenant_no(db: Session, user: dict) -> str:
return "zkxw"
# ---------------------------------------------------------------------------
# 工作流角色
# ---------------------------------------------------------------------------
class OaRoleCreateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
role_name: str = Field(..., alias="roleName")
role_code: str = Field(..., alias="roleCode")
status: Optional[str] = Field("1")
order_num: Optional[int] = Field(None, alias="orderNum")
remark: Optional[str] = None
class OaRoleUpdateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
role_name: Optional[str] = Field(None, alias="roleName")
status: Optional[str] = None
order_num: Optional[int] = Field(None, alias="orderNum")
remark: Optional[str] = None
class OaRoleUsersBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
user_ids: List[str] = Field(default_factory=list, alias="userIds")
@router.get("/roles")
async def list_oa_roles(
keyword: Optional[str] = None,
status: Optional[str] = None,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
items = oa_crud.list_roles(db, tenant_no=tenant_no, keyword=keyword, status=status)
return success_response({"list": items})
@router.post("/roles/ensure-presets")
async def ensure_oa_role_presets(
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
created = oa_crud.ensure_presets(db, tenant_no, user_id=user.get("user_id"))
return success_response(
{"createdCount": len(created)},
message="预置角色已就绪",
)
@router.post("/roles")
async def create_oa_role(
body: OaRoleCreateBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
obj = oa_crud.create_role(
db,
tenant_no=tenant_no,
role_name=body.role_name,
role_code=body.role_code,
status=body.status or "1",
order_num=body.order_num,
remark=body.remark,
user_id=user.get("user_id"),
)
return success_response(oa_crud._role_to_dict(obj), message="创建成功")
except ValueError as e:
return error_response(400, str(e))
@router.put("/roles/{role_id}")
async def update_oa_role(
role_id: str,
body: OaRoleUpdateBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
payload: dict[str, Any] = body.model_dump(exclude_unset=True, by_alias=False)
obj = oa_crud.update_role(
db,
role_id,
tenant_no=tenant_no,
role_name=payload.get("role_name"),
status=payload.get("status"),
order_num=payload.get("order_num"),
remark=payload.get("remark"),
user_id=user.get("user_id"),
)
return success_response(oa_crud._role_to_dict(obj), message="更新成功")
except ValueError as e:
return error_response(400, str(e))
@router.delete("/roles/{role_id}")
async def delete_oa_role(
role_id: str,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
oa_crud.delete_role(db, role_id, tenant_no=tenant_no, user_id=user.get("user_id"))
return success_response(None, message="删除成功")
except ValueError as e:
return error_response(400, str(e))
@router.get("/roles/{role_id}/users")
async def list_oa_role_users(
role_id: str,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
tenant_no = _get_tenant_no(db, user)
if not oa_crud.get_role(db, role_id, tenant_no):
return error_response(404, "角色不存在")
return success_response({"list": oa_crud.list_role_users(db, role_id, tenant_no)})
@router.put("/roles/{role_id}/users")
async def replace_oa_role_users(
role_id: str,
body: OaRoleUsersBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
oa_crud.replace_role_users(
db,
role_id,
tenant_no=tenant_no,
user_ids=body.user_ids,
operator_id=user.get("user_id"),
)
return success_response(
{"list": oa_crud.list_role_users(db, role_id, tenant_no)},
message="成员已更新",
)
except ValueError as e:
return error_response(400, str(e))
# ---------------------------------------------------------------------------
# 收款账户
# ---------------------------------------------------------------------------
@@ -495,6 +345,29 @@ async def create_oa_app(
return error_response(400, str(e))
@router.post("/apps/{app_id}/copy")
async def copy_oa_app(
app_id: str,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
obj = oa_crud.copy_app(
db, app_id, tenant_no=tenant_no, user_id=user.get("user_id")
)
group_name = ""
if obj.group_id:
g = oa_crud.get_group(db, obj.group_id, tenant_no)
group_name = g.group_name if g else ""
return success_response(
oa_crud._app_to_dict(obj, group_name=group_name, has_draft=True),
message="复制成功",
)
except ValueError as e:
return error_response(400, str(e))
@router.put("/apps/{app_id}")
async def update_oa_app(
app_id: str,