超级总管 - 管理员全模块返工

Server/application/superadmin/controller/administrator/GetAdministratorDetailController.php

@@ -22,11 +22,10 @@ class GetAdministratorDetailController extends BaseController
     {
         $admin = AdministratorModel::alias('a')
             ->field(
-                'a.id, a.account username, a.name, a.status, a.authId, a.createTime createdAt, a.lastLoginTime lastLogin, p.permissions'
+                'a.id, a.account, a.name, a.status, a.authId, a.createTime createdAt, a.lastLoginTime lastLogin, p.permissions'
             )
             ->leftJoin('administrator_permissions p', 'a.id = p.adminId')
             ->where('a.id', $adminId)
-            ->where('a.deleteTime', 0)
             ->find();
 
         if (!$admin) {
@@ -98,7 +97,7 @@ class GetAdministratorDetailController extends BaseController
                 'data' => array_merge($admin->toArray(), [
                     'roleName' => $roleName,
                     'permissions' => $permissionIds,
-                    'lastLogin' => !empty($admin->lastLogin) ? date('Y-m-d H:i', $admin->lastLogin) : '从未登录',
+                    'lastLogin' => $admin->lastLogin ? date('Y-m-d H:i', $admin->lastLogin) : '从未登录',
                     'createdAt' => date('Y-m-d H:i', $admin->createdAt),
                 ])
             ]);