提交
This commit is contained in:
1 parent
b9ff9c9d67
commit
44749ae716
87 files changed
+35089
-21918
No files matched your search
@@ -27,7 +27,7 @@ from app.crud import user as user_svc
|
||||
from app.crud import role as role_svc
|
||||
from app.crud import user as user_svc
|
||||
from app.crud import oss as oss_svc
|
||||
from app.models.models import SysDept, SysDictData, SysRole, SysUser
|
||||
from app.models.models import SysDept, SysDictData, SysRole, SysUser, SysUserRole
|
||||
from app.schemas.menu_favorite import (
|
||||
MenuFavoriteCreateBody,
|
||||
MenuFavoriteDeleteBody,
|
||||
@@ -316,6 +316,20 @@ def list_users(
|
||||
result_list = [
|
||||
user_svc._row_to_dict(r, dept_name=dept_map.get(r.dept_id or "", "")) for r in items
|
||||
]
|
||||
user_ids = [d["id"] for d in result_list if d.get("id")]
|
||||
role_map: dict[str, list[str]] = {uid: [] for uid in user_ids}
|
||||
if user_ids:
|
||||
for ur in (
|
||||
db.query(SysUserRole)
|
||||
.filter(
|
||||
SysUserRole.user_id.in_(user_ids),
|
||||
SysUserRole.del_flag == 0,
|
||||
)
|
||||
.all()
|
||||
):
|
||||
role_map.setdefault(ur.user_id, []).append(ur.role_id)
|
||||
for d in result_list:
|
||||
d["roleIds"] = role_map.get(d["id"], [])
|
||||
tp = user_svc.total_pages(total, pageSize)
|
||||
return success_response({"list": result_list, "total": total, "page": page, "pageSize": pageSize, "totalPages": tp})
|
||||
|
||||
@@ -1226,6 +1240,23 @@ def create_role_management(
|
||||
return error_response(400, str(e))
|
||||
|
||||
|
||||
@router.get("/role-management/{role_id}")
|
||||
def get_role_management(
|
||||
role_id: str,
|
||||
user: dict = Depends(require_admin_or_super_admin),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
tenant_no = _get_tenant_no(db, user)
|
||||
obj = role_svc.get_role(db, role_id)
|
||||
if not obj or obj.tenant_no != tenant_no:
|
||||
return error_response(404, "角色不存在")
|
||||
try:
|
||||
assert_row_in_data_scope(db, obj, SysRole, user, tenant_no)
|
||||
except HTTPException:
|
||||
return error_response(403, "无权查看该角色")
|
||||
return success_response(role_svc._row_to_dict(obj))
|
||||
|
||||
|
||||
@router.put("/role-management/{role_id}")
|
||||
def update_role_management(
|
||||
role_id: str,
|
||||
|
||||
Reference in new issue
Block a user