fix issues

Author: wu-clan

backend/app/admin/api/v1/sys/data_rule.py

@@ -25,7 +25,7 @@ async def get_data_rule_models() -> ResponseSchemaModel[list[str]]:
 @router.get('/model/{model}/columns', summary='获取数据规则可用模型列', dependencies=[DependsJwtAuth])
 async def get_data_rule_model_columns(
     model: Annotated[str, Path(description='模型名称')],
-) -> ResponseSchemaModel[list[str]]:
+) -> ResponseSchemaModel[list[dict[str, str]]]:
     models = await data_rule_service.get_columns(model=model)
     return response_base.success(data=models)
 

backend/app/admin/api/v1/sys/dept.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from typing import Annotated, Any
 
-from fastapi import APIRouter, Depends, Path, Query
+from fastapi import APIRouter, Depends, Path, Query, Request
 
 from backend.app.admin.schema.dept import CreateDeptParam, GetDeptDetail, UpdateDeptParam
 from backend.app.admin.service.dept_service import dept_service
@@ -22,12 +22,13 @@ async def get_dept(pk: Annotated[int, Path(description='部门 ID')]) -> Respons
 
 @router.get('', summary='获取所有部门展示树', dependencies=[DependsJwtAuth])
 async def get_all_depts(
+    request: Request,
     name: Annotated[str | None, Query(description='部门名称')] = None,
     leader: Annotated[str | None, Query(description='部门负责人')] = None,
     phone: Annotated[str | None, Query(description='联系电话')] = None,
     status: Annotated[int | None, Query(description='状态')] = None,
 ) -> ResponseSchemaModel[list[dict[str, Any]]]:
-    dept = await dept_service.get_dept_tree(name=name, leader=leader, phone=phone, status=status)
+    dept = await dept_service.get_dept_tree(request=request, name=name, leader=leader, phone=phone, status=status)
     return response_base.success(data=dept)
 
 

backend/app/admin/crud/crud_data_rule.py

@@ -31,7 +31,7 @@ async def get_list(self, name: str | None) -> Select:
         :param name: 规则名称
         :return:
         """
-        stmt = select(self.model).options(noload(self.model.roles)).order_by(desc(self.model.created_time))
+        stmt = select(self.model).options(noload(self.model.scope)).order_by(desc(self.model.created_time))
 
         filters = []
         if name is not None:

backend/app/admin/crud/crud_dept.py

@@ -2,13 +2,15 @@
 # -*- coding: utf-8 -*-
 from typing import Sequence
 
+from fastapi import Request
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload
 from sqlalchemy_crud_plus import CRUDPlus
 
 from backend.app.admin.model import Dept
 from backend.app.admin.schema.dept import CreateDeptParam, UpdateDeptParam
+from backend.common.security.permission import filter_data_permission
 
 
 class CRUDDept(CRUDPlus[Dept]):
@@ -35,11 +37,18 @@ async def get_by_name(self, db: AsyncSession, name: str) -> Dept | None:
         return await self.select_model_by_column(db, name=name, del_flag=0)
 
     async def get_all(
-        self, db: AsyncSession, name: str | None, leader: str | None, phone: str | None, status: int | None
+        self,
+        request: Request,
+        db: AsyncSession,
+        name: str | None,
+        leader: str | None,
+        phone: str | None,
+        status: int | None,
     ) -> Sequence[Dept]:
         """
         获取所有部门
 
+        :param request: FastAPI 请求对象
         :param db: 数据库会话
         :param name: 部门名称
         :param leader: 负责人
@@ -56,7 +65,7 @@ async def get_all(
             filters.update(phone__startswith=phone)
         if status is not None:
             filters.update(status=status)
-        return await self.select_models_order(db, sort_columns='sort', **filters)
+        return await self.select_models_order(db, 'sort', None, await filter_data_permission(db, request), **filters)
 
     async def create(self, db: AsyncSession, obj: CreateDeptParam) -> None:
         """

backend/app/admin/crud/crud_user.py

@@ -311,7 +311,7 @@ async def get_with_relation(
         """
         stmt = select(self.model).options(
             selectinload(self.model.dept),
-            selectinload(self.model.roles).options(selectinload(Role.menus), selectinload(Role.rules)),
+            selectinload(self.model.roles).options(selectinload(Role.menus), selectinload(Role.scopes)),
         )
 
         filters = []

backend/app/admin/model/data_rule.py

@@ -5,8 +5,6 @@
 from typing import TYPE_CHECKING
 
 from sqlalchemy import ForeignKey, String
-from sqlalchemy.dialects.mysql import LONGTEXT
-from sqlalchemy.dialects.postgresql import TEXT
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from backend.common.model import Base, id_key
@@ -21,17 +19,17 @@ class DataRule(Base):
     __tablename__ = 'sys_data_rule'
 
     id: Mapped[id_key] = mapped_column(init=False)
-    model: Mapped[str] = mapped_column(String(50), comment='SQLA 模型类名')
+    name: Mapped[str] = mapped_column(String(500), unique=True, comment='名称')
+    model: Mapped[str] = mapped_column(String(50), comment='SQLA 模型名，对应 DATA_PERMISSION_MODELS 键名')
     column: Mapped[str] = mapped_column(String(20), comment='模型字段名')
     operator: Mapped[int] = mapped_column(comment='运算符（0：and、1：or）')
     expression: Mapped[int] = mapped_column(
         comment='表达式（0：==、1：!=、2：>、3：>=、4：<、5：<=、6：in、7：not_in）'
     )
     value: Mapped[str] = mapped_column(String(255), comment='规则值')
-    remark: Mapped[str] = mapped_column(LONGTEXT().with_variant(TEXT, 'postgresql'), comment='备注')
 
     # 数据范围规则一对多
-    rule_id: Mapped[int | None] = mapped_column(
+    scope_id: Mapped[int | None] = mapped_column(
         ForeignKey('sys_data_scope.id', ondelete='SET NULL'), default=None, comment='数据范围关联 ID'
     )
-    rule: Mapped[DataScope] = relationship(init=False, back_populates='rules')
+    scope: Mapped[DataScope] = relationship(init=False, back_populates='rules')

backend/app/admin/model/data_scope.py

@@ -1,13 +1,18 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from sqlalchemy import String
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from backend.app.admin.model import DataRule, Role
 from backend.app.admin.model.m2m import sys_role_data_scope
 from backend.common.model import Base, id_key
 
+if TYPE_CHECKING:
+    from backend.app.admin.model import DataRule, Role
+
 
 class DataScope(Base):
     """数据范围表"""

backend/app/admin/schema/data_rule.py

@@ -14,10 +14,9 @@ class DataRuleSchemaBase(SchemaBase):
     name: str = Field(description='规则名称')
     model: str = Field(description='模型名称')
     column: str = Field(description='字段名称')
-    operator: RoleDataRuleOperatorType = Field(RoleDataRuleOperatorType.OR, description='操作符（AND/OR）')
+    operator: RoleDataRuleOperatorType = Field(RoleDataRuleOperatorType.AND, description='操作符（AND/OR）')
     expression: RoleDataRuleExpressionType = Field(RoleDataRuleExpressionType.eq, description='表达式类型')
     value: str = Field(description='规则值')
-    remark: str = Field(description='备注')
 
 
 class CreateDataRuleParam(DataRuleSchemaBase):

backend/app/admin/service/data_rule_service.py

@@ -36,7 +36,7 @@ async def get_models() -> list[str]:
         return list(settings.DATA_PERMISSION_MODELS.keys())
 
     @staticmethod
-    async def get_columns(model: str) -> list[str]:
+    async def get_columns(model: str) -> list[dict[str, str]]:
         """
         获取数据规则可用模型的字段列表
 
@@ -46,8 +46,11 @@ async def get_columns(model: str) -> list[str]:
         if model not in settings.DATA_PERMISSION_MODELS:
             raise errors.NotFoundError(msg='数据规则可用模型不存在')
         model_ins = dynamic_import_data_model(settings.DATA_PERMISSION_MODELS[model])
+
         model_columns = [
-            key for key in model_ins.__table__.columns.keys() if key not in settings.DATA_PERMISSION_COLUMN_EXCLUDE
+            {column.key: column.comment}
+            for column in model_ins.__table__.columns
+            if column.key not in settings.DATA_PERMISSION_COLUMN_EXCLUDE
         ]
         return model_columns
 
@@ -95,6 +98,9 @@ async def update(*, pk: int, obj: UpdateDataRuleParam) -> int:
             data_rule = await data_rule_dao.get(db, pk)
             if not data_rule:
                 raise errors.NotFoundError(msg='数据规则不存在')
+            if data_rule.name != obj.name:
+                if await data_rule_dao.get_by_name(db, obj.name):
+                    raise errors.ForbiddenError(msg='数据规则已存在')
             count = await data_rule_dao.update(db, pk, obj)
             return count
 

backend/app/admin/service/data_scope_service.py

@@ -80,6 +80,9 @@ async def update(*, pk: int, obj: UpdateDataScopeParam) -> int:
             data_scope = await data_scope_dao.get(db, pk)
             if not data_scope:
                 raise errors.NotFoundError(msg='数据范围不存在')
+            if data_scope.name != obj.name:
+                if await data_scope_dao.get_by_name(db, obj.name):
+                    raise errors.ForbiddenError(msg='数据范围已存在')
             count = await data_scope_dao.update(db, pk, obj)
             for role in await data_scope.awaitable_attrs.roles:
                 for user in await role.awaitable_attrs.users: