From 0312078755d70370a496c556c0360221f3ba210b Mon Sep 17 00:00:00 2001
From: ai567 <978713427@qq.com>
Date: Fri, 29 Nov 2024 08:48:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=88=87=E8=8A=B1la?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/system/SystemAuthService.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/services/system/SystemAuthService.php b/app/services/system/SystemAuthService.php
index d36af7d..56af90d 100644
--- a/app/services/system/SystemAuthService.php
+++ b/app/services/system/SystemAuthService.php
@@ -13,8 +13,10 @@
 namespace app\services\system;
 
 use app\dao\system\SystemUserDao;
-use app\model\tp\system\SystemMenu;
-use app\model\tp\system\SystemUser;
+use app\model\tp\system\SystemMenu as TpSystemMenu;
+use app\model\la\system\SystemMenu as LaSystemMenu;
+use app\model\tp\system\SystemUser as TpSystemUser;
+use app\model\la\system\SystemUser as LaSystemUser;
 use madong\basic\BaseService;
 use madong\exception\AuthException;
 use madong\services\cache\CacheService;
@@ -131,14 +133,14 @@ class SystemAuthService extends BaseService
         if ($list instanceof \Illuminate\Database\Eloquent\Collection) {
             foreach ($list as $item) {
                 $item->set('name', $item->code);
-                $item->set('meta', SystemMenu::getMetaAttribute($item));
+                $item->set('meta', LaSystemMenu::getMetaAttribute($item));
             }
             $list->makeVisible(['id', 'pid', 'type', 'sort', 'redirect', 'path', 'name', 'meta', 'component']);
         } else {
             //默认tp模型
             foreach ($list as $item) {
                 $item->set('name', $item->getData('code'));
-                $item->set('meta', $item->meta);
+                $item->set('meta', TpSystemMenu::getMetaAttribute($item));
             }
             $list->visible(['id', 'pid', 'type', 'sort', 'redirect', 'path', 'name', 'meta', 'component']);
         }
@@ -305,11 +307,11 @@ class SystemAuthService extends BaseService
     /**
      * 获取头像
      *
-     * @param \app\model\tp\system\SystemUser $adminInfo
+     * @param TpSystemUser|LaSystemUser $adminInfo
      *
      * @return string
      */
-    private function getAvatarUrl(SystemUser $adminInfo): string
+    private function getAvatarUrl(TpSystemUser|LaSystemUser $adminInfo): string
     {
         /**@var SystemConfigService  $systemConfigService */
         $systemConfigService = Container::make(SystemConfigService::class);
-- 
Gitee