merge: branch 'master' of github.com:hyperf-admin/hyperf-admin

2026-01-15 06:55:06 +08:00 · 2020-08-31 15:52:26 +08:00
parent 8335834ffd 8ece44f3b6
commit 69f4a88517
1 changed files with 3 additions and 3 deletions
--- a/src/admin/src/Controller/UserController.php
+++ b/src/admin/src/Controller/UserController.php
@@ -90,9 +90,9 @@ class UserController extends AdminAbstractController
                    'type' => 'date_range',
                ],
            ],
-            'hasOne' => [
-                'hyperf_admin.hyperf_admin.user_role:user_id,role_id',
-            ],
+            'hasOne' => function ($field, $row) {
+                return 'hyperf_admin.'.env('HYPERF_ADMIN_DB_NAME').'.user_role:user_id,role_id';
+            },
            'table' => [
                'columns' => [
                    'id',