From be203cb7152b265e068dbff13e649ca87f9ff7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=20=E6=9F=8F?= Date: Tue, 24 Dec 2024 17:27:44 +0900 Subject: [PATCH] permission table add link column for menu --- backend/app/db/cruddb/dbuser.py | 4 ++-- backend/app/db/models.py | 1 + backend/app/db/schemas.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/app/db/cruddb/dbuser.py b/backend/app/db/cruddb/dbuser.py index 8a490fd..88316fd 100644 --- a/backend/app/db/cruddb/dbuser.py +++ b/backend/app/db/cruddb/dbuser.py @@ -84,8 +84,8 @@ class dbuser(crudbase): db.refresh(db_user) return db_user - def get_permissions(self,db: Session,user_id: int) -> t.List[schemas.Permission]: - return dbpermission.get_all(db).all() + def get_permissions(self,db: Session) -> t.List[schemas.Permission]: + return db.execute(dbpermission.get_all()).scalars().all() def get_user_permissions(self,db: Session,user_id: int) -> t.List[schemas.Permission]: permissions =[] diff --git a/backend/app/db/models.py b/backend/app/db/models.py index e75ded4..df8ee51 100644 --- a/backend/app/db/models.py +++ b/backend/app/db/models.py @@ -56,6 +56,7 @@ class Permission(Base): menu = mapped_column(String(100)) function = mapped_column(String(255)) + link = mapped_column(String(100)) privilege = mapped_column(String(100)) roles = relationship("Role",secondary=rolepermission,back_populates="permissions") diff --git a/backend/app/db/schemas.py b/backend/app/db/schemas.py index 22c8fdd..49a99f8 100644 --- a/backend/app/db/schemas.py +++ b/backend/app/db/schemas.py @@ -13,6 +13,7 @@ class Permission(BaseModel): id: int menu:str function:str + link:str privilege:str class RoleBase(BaseModel):