修复使用自定义数据权限报错问题

This commit is contained in:
ktianc 2024-03-09 12:30:18 +08:00
parent 2c39c91108
commit 8265cbc6d0
2 changed files with 6 additions and 2 deletions

View File

@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer
""" """
系统版本 系统版本
""" """
VERSION = "3.8.1" VERSION = "3.8.2"
"""安全警告: 不要在生产中打开调试运行!""" """安全警告: 不要在生产中打开调试运行!"""
DEBUG = False DEBUG = False

View File

@ -94,7 +94,11 @@ class FullAdminAuth(AuthValidation):
if not settings.OAUTH_ENABLE: if not settings.OAUTH_ENABLE:
return Auth(db=db) return Auth(db=db)
telephone, password = self.validate_token(request, token) telephone, password = self.validate_token(request, token)
options = [joinedload(VadminUser.roles).subqueryload(VadminRole.menus), joinedload(VadminUser.depts)] options = [
joinedload(VadminUser.roles).subqueryload(VadminRole.menus),
joinedload(VadminUser.roles).subqueryload(VadminRole.depts),
joinedload(VadminUser.depts)
]
user = await UserDal(db).get_data( user = await UserDal(db).get_data(
telephone=telephone, telephone=telephone,
password=password, password=password,