!15 3.8.1

Merge pull request !15 from ktianc/master
2024-03-09 08:59:47 +00:00 · 2024-03-09 08:59:47 +00:00 · 13bfb7d7b8
commit 13bfb7d7b8
parent 4d240c24d2 8265cbc6d0
2 changed files with 6 additions and 2 deletions
--- a/kinit-api/application/settings.py
+++ b/kinit-api/application/settings.py
@ -11,7 +11,7 @@ from fastapi.security import OAuth2PasswordBearer
 """
 系统版本
 """
-VERSION = "3.8.1"
+VERSION = "3.8.2"

 """安全警告: 不要在生产中打开调试运行!"""
 DEBUG = False
--- a/kinit-api/apps/vadmin/auth/utils/current.py
+++ b/kinit-api/apps/vadmin/auth/utils/current.py
@ -94,7 +94,11 @@ class FullAdminAuth(AuthValidation):
        if not settings.OAUTH_ENABLE:
            return Auth(db=db)
        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(
            telephone=telephone,
            password=password,