From 8265cbc6d096fa51ccdbdbfe652afa914e812414 Mon Sep 17 00:00:00 2001
From: ktianc <2445667550@qq.com>
Date: Sat, 9 Mar 2024 12:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kinit-api/application/settings.py           | 2 +-
 kinit-api/apps/vadmin/auth/utils/current.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/kinit-api/application/settings.py b/kinit-api/application/settings.py
index 8b3732a..6642c12 100644
--- 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
diff --git a/kinit-api/apps/vadmin/auth/utils/current.py b/kinit-api/apps/vadmin/auth/utils/current.py
index ea54b4b..c384aad 100644
--- 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,