完善功能

app/admin/controller/sys_manage/RoleController.php

@@ -48,6 +48,7 @@ class RoleController extends Curd
                 'name' => $item->role_name,
                 'value' => (string)$item->role_id,
                 'id' => $item->id ?? $item->role_id,
+                'role_id' => $item->id ?? $item->role_id,
                 'pid' => $item->pid ?? $item->role_superior_id,
                 'role_status' => $item->role_status,
                 'role_permission' => $item->role_permission,

app/admin/service/sys_manage/UserService.php

@@ -24,7 +24,8 @@ class UserService
         $pageSize = $request->get('pageSize', 10);
         $username = $request->get('username', '');
 
-        $rows = SysUser::select('join_user_role_id', 'join_user_dept_id', 'user_id', 'user_status', 'user_category', 'user_name', 'user_login_name', 'user_mobile', 'user_remark', 'user_extend_json', 'user_addtimes')
+        $rows = SysUser::with('role')
+            ->select('join_user_role_id', 'join_user_dept_id', 'user_id', 'user_status', 'user_category', 'user_name', 'user_login_name', 'user_mobile', 'user_remark', 'user_extend_json', 'user_addtimes')
             ->when($username != '', function ($query) use ($username) {
                 $query->where('user_name', 'like', '%' . $username . '%');
             })
@@ -162,7 +163,7 @@ class UserService
      */
     public static function updatePassword($id, $params)
     {
-        if ($params['user_login_pass'] != $params['confirmNewPassword']){
+        if ($params['user_login_pass'] != $params['confirmNewPassword']) {
             return json_fail('两次密码不一致');
         }
         $user = SysUser::where('user_id', $id)->first();
@@ -170,10 +171,10 @@ class UserService
             return json_fail('原密码错误');
         }
         try {
-            SysUser::where('user_id',$id)->update(['user_login_pass'=>md5(sha1($params['user_login_pass']))]);
+            SysUser::where('user_id', $id)->update(['user_login_pass' => md5(sha1($params['user_login_pass']))]);
 
             return json_success('密码修改成功');
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             dump($e->getMessage());
             return json_fail('密码修改失败');
         }

app/model/SysUser.php

@@ -14,8 +14,15 @@ class SysUser extends Model
 
     protected $keyType = 'string';
 
-    public function getUserAddtimesAttribute($value){
-        return date('Y-m-d H:i:s',$value);
+    public function getUserAddtimesAttribute($value)
+    {
+        return date('Y-m-d H:i:s', $value);
+    }
+
+    public function role()
+    {
+        return $this->hasOne(SysRole::class, 'role_id', 'join_user_role_id')
+            ->select('role_id', 'role_name');
     }
 
     /* 按登录名查找用户 */