lip 3 месяцев назад
Родитель
Сommit
cea056f6d8
2 измененных файлов с 4 добавлено и 2 удалено
  1. 1 1
      .gitignore
  2. 3 1
      app/admin/controller/Admin.php

+ 1 - 1
.gitignore

@@ -3,5 +3,5 @@ public/nginx.htaccess
 public/unpackage
 public/.htaccess
 public/h5
-vender/
+vendor/
 runtime/

+ 3 - 1
app/admin/controller/Admin.php

@@ -228,7 +228,9 @@ class Admin extends BaseController
                     ->select()
                     ->toArray();
             }
-            $admin->role_name = Role::where('id', $admin->role_id)->value('name');
+            $role = Role::where('id', $admin->role_id)->find();
+            $admin->role_name = $role ? $role->name : '';
+            $admin->avatar = $role ? $role->avatar : '';
             $admin->department_name = Department::where('id', $admin->department_id)->value('name');
 
             //标记需要签到