Skip to content

refactor: 去除 UserMixin 审计字段外键约束以消除循环外键 #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fastapiadmin merged 1 commit into from
Oct 22, 2026
Merged

refactor: 去除 UserMixin 审计字段外键约束以消除循环外键 #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions backend/app/core/base_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from datetime import UTC, datetime

from sqlalchemy import Boolean, DateTime, ForeignKey, Index, Integer, MetaData, String
from sqlalchemy import Boolean, DateTime, Index, Integer, MetaData, String
from sqlalchemy.ext.asyncio import AsyncAttrs
from sqlalchemy.orm import DeclarativeBase, Mapped, declared_attr, mapped_column, relationship

Expand Down Expand Up @@ -132,15 +132,13 @@ class UserMixin(MappedBase):

created_id: Mapped[int | None] = mapped_column(
Integer,
ForeignKey("sys_user.id", ondelete="SET NULL", onupdate="CASCADE"),
default=None,
nullable=True,
index=True,
comment="创建人ID",
)
updated_id: Mapped[int | None] = mapped_column(
Integer,
ForeignKey("sys_user.id", ondelete="SET NULL", onupdate="CASCADE"),
default=None,
nullable=True,
index=True,
Expand All @@ -149,7 +147,6 @@ class UserMixin(MappedBase):

deleted_id: Mapped[int | None] = mapped_column(
Integer,
ForeignKey("sys_user.id", ondelete="SET NULL", onupdate="CASCADE"),
default=None,
nullable=True,
index=True,
Expand All @@ -161,7 +158,7 @@ def created_by(self):
"""创建人关联关系"""
return relationship(
"UserModel",
foreign_keys=lambda: self.created_id, # pyright: ignore[reportArgumentType]
primaryjoin=f"foreign({self.__name__}.created_id) == remote(UserModel.id)",
uselist=False,
)

Expand All @@ -170,7 +167,7 @@ def updated_by(self):
"""更新人关联关系"""
return relationship(
"UserModel",
foreign_keys=lambda: self.updated_id, # pyright: ignore[reportArgumentType]
primaryjoin=f"foreign({self.__name__}.updated_id) == remote(UserModel.id)",
uselist=False,
)

Expand All @@ -179,6 +176,6 @@ def deleted_by(self):
"""删除人关联关系"""
return relationship(
"UserModel",
foreign_keys=lambda: self.deleted_id, # pyright: ignore[reportArgumentType]
primaryjoin=f"foreign({self.__name__}.deleted_id) == remote(UserModel.id)",
uselist=False,
)
23 changes: 19 additions & 4 deletions backend/app/modules/system/user/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,25 @@ class UserModel(ModelMixin, UserMixin):
status: Mapped[int] = mapped_column(Integer, default=0, nullable=False, comment="状态(0:启动 1:停用)")
description: Mapped[str | None] = mapped_column(Text, default=None, nullable=True, comment="备注")

dept_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_dept.id", ondelete="SET NULL", onupdate="CASCADE", use_alter=True), nullable=True, index=True, comment="部门ID")
dept_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("sys_dept.id", ondelete="SET NULL", onupdate="CASCADE"), nullable=True, index=True, comment="部门ID")
dept: Mapped["DeptModel | None"] = relationship(back_populates="users", foreign_keys=[dept_id])
roles: Mapped[list["RoleModel"]] = relationship(secondary="sys_user_roles", back_populates="users")
positions: Mapped[list["PositionModel"]] = relationship(secondary="sys_user_positions", back_populates="users")
created_by: Mapped["UserModel | None"] = relationship("UserModel", foreign_keys="UserModel.created_id", remote_side="UserModel.id", uselist=False, viewonly=True)
updated_by: Mapped["UserModel | None"] = relationship("UserModel", foreign_keys="UserModel.updated_id", remote_side="UserModel.id", uselist=False, viewonly=True)
deleted_by: Mapped["UserModel | None"] = relationship("UserModel", foreign_keys="UserModel.deleted_id", remote_side="UserModel.id", uselist=False, viewonly=True)
created_by: Mapped["UserModel | None"] = relationship(
"UserModel",
primaryjoin="foreign(UserModel.created_id) == remote(UserModel.id)",
uselist=False,
viewonly=True,
)
updated_by: Mapped["UserModel | None"] = relationship(
"UserModel",
primaryjoin="foreign(UserModel.updated_id) == remote(UserModel.id)",
uselist=False,
viewonly=True,
)
deleted_by: Mapped["UserModel | None"] = relationship(
"UserModel",
primaryjoin="foreign(UserModel.deleted_id) == remote(UserModel.id)",
uselist=False,
viewonly=True,
)
Loading