From 95cb1bd83cb38398431ca68801a2f9473f857e11 Mon Sep 17 00:00:00 2001
From: Wu Clan <jianhengwu0407@gmail.com>
Date: Mon, 11 Nov 2024 18:59:05 +0800
Subject: [PATCH] add comments

---
 backend/app/admin/api/v1/sys/role.py  |  9 +++++++--
 backend/common/security/permission.py | 25 ++++++++-----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/backend/app/admin/api/v1/sys/role.py b/backend/app/admin/api/v1/sys/role.py
index 043553e1..ab8549e2 100644
--- a/backend/app/admin/api/v1/sys/role.py
+++ b/backend/app/admin/api/v1/sys/role.py
@@ -4,8 +4,13 @@
 
 from fastapi import APIRouter, Depends, Path, Query, Request
 
-from backend.app.admin.schema.role import CreateRoleParam, GetRoleListDetails, UpdateRoleMenuParam, UpdateRoleParam, \
-    UpdateRoleDeptParam
+from backend.app.admin.schema.role import (
+    CreateRoleParam,
+    GetRoleListDetails,
+    UpdateRoleDeptParam,
+    UpdateRoleMenuParam,
+    UpdateRoleParam,
+)
 from backend.app.admin.service.menu_service import menu_service
 from backend.app.admin.service.role_service import role_service
 from backend.common.pagination import DependsPagination, paging_data
diff --git a/backend/common/security/permission.py b/backend/common/security/permission.py
index 28d41368..f67417a1 100644
--- a/backend/common/security/permission.py
+++ b/backend/common/security/permission.py
@@ -3,10 +3,8 @@
 from typing import Any
 
 from fastapi import Request
-from sqlalchemy import Select, select
+from sqlalchemy import Select
 
-from backend.app.admin.model import User
-from backend.app.admin.model.m2m import sys_role_dept
 from backend.common.exception.errors import ServerError
 from backend.core.conf import settings
 
@@ -33,13 +31,13 @@ async def __call__(self, request: Request):
 
 def filter_user_data_scope(request: Request, model: Any, stmt: Select) -> Select:
     """
-    获取用户数据范围
+    筛选用户数据范围
 
     使用场景：对于非后台管理数据，需要在前端界面向用户进行展示的数据
 
-    :param request:
-    :param model:
-    :param stmt:
+    :param request: 接口请求对象
+    :param model: 当前需要进行数据过滤的 sqlalchemy 模型
+    :param stmt: 需要进行数据筛选的 stmt（select） 语句
     :return:
     """
     user_roles = request.user.roles
@@ -50,22 +48,15 @@ def filter_user_data_scope(request: Request, model: Any, stmt: Select) -> Select
     # 全部数据
     if data_scope == 0:
         stmt = stmt
-    # 自定义数据
+    # 自定义数据（自选部门）
     elif data_scope == 1:
-        stmt = stmt.where(
-            model.create_user.in_(
-                select(User.id)
-                .select_from(sys_role_dept)
-                .join(User, User.dept_id == sys_role_dept.c.dept_id)
-                .where(sys_role_dept.c.role_id.in_(user_roles))
-            )
-        )
+        ...
     # 所在部门及以下数据
     elif data_scope == 2:
         ...  # TODO
     # 所在部门数据
     elif data_scope == 3:
-        stmt = stmt.where(select(User.id).where(User.dept_id == request.user.dept_id))
+        ...
     # 仅本人数据
     elif data_scope == 4:
         stmt = stmt.where(model.create_user == request.user.id)