权限管理部分内容

app/Http/Controllers/Admin/AdminUserController.php

@@ -49,7 +49,12 @@ class AdminUserController extends BaseController
                 $items = $items->where($tmp_item, 'like', '%' . $request->input($tmp_item) . '%');
             }
         }
-
+        if ($request->input('admin_role_id'))
+        {
+            $items->whereHas('adminroles',function ($query){
+                $query->where('id','=',request('admin_role_id'));
+            });
+        }
         $select_items = collect([]);
         foreach($select_items as $select_item) {
             if($request->has($select_item) && !empty($request->input($select_item))) {
@@ -58,15 +63,16 @@ class AdminUserController extends BaseController
         }
 
         $items = $items->paginate();
-//        foreach($items as $item) {
-//            $item->role_name = empty($item->adminRole) ? '' : $item->adminRole->name;
-//        }
+        foreach($items as $item) {
+            $item->role_name = empty($item->adminroles) ? '' : $item->adminroles->name;
+        }
         return response()->json(['code' => 0, 'message' => '', 'count' => $items->total(), 'data' => $items->items()]);
     }
 
     public function create()
     {
         $admin_role_options = $this->adminRole->getOptions();
+        unset($admin_role_options[0]);
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
         return view($this->view_path . 'create', compact('model', 'model_name','pre_uri', 'admin_role_options'));
     }
@@ -90,6 +96,7 @@ class AdminUserController extends BaseController
     {
         if(empty($request->input('id')) || empty($item = $this->model->find($request->input('id')))) return back()->withErrors(['sg_error_info' => '找不到要编辑的数据']);
         $admin_role_options = $this->adminRole->getOptions();
+        unset($admin_role_options[0]);
         list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
         return view($this->view_path . 'edit', compact('model', 'model_name', 'pre_uri', 'item', 'admin_role_options'));
     }

app/Http/Controllers/Admin/Base/RoleController.php

@@ -63,7 +63,8 @@ class RoleController extends Controller
             }
         }
         $level = $this->level;
-        return view('admin.base.role.edit', compact('level', 'Departments'));
+//        return view('admin.base.role.edit', compact('level', 'Departments'));
+        return view('admin.base.role.edit', compact('level'));
     }
 
     /**
@@ -83,7 +84,8 @@ class RoleController extends Controller
         }
         $data = $this->_service->find(Request::input('id'));
         $level = $this->level;
-        return view('admin.base.role.edit', compact('data', 'level', 'Departments'));
+//        return view('admin.base.role.edit', compact('data', 'level', 'Departments'));
+        return view('admin.base.role.edit', compact('data', 'level'));
     }
     
     /**

app/Models/AdminUserModel.php

@@ -79,6 +79,9 @@ class AdminUserModel extends Authenticatable
     {
         return $this->belongsTo('App\Models\AdminRoleModel', 'admin_role_id');
     }
+    public function adminroles(){
+        return $this->hasOne(AdminRoleModel::class,'id','admin_role_id');
+    }
 
     public function updateToken()
     {

resources/views/admin/admin-users/create.blade.php

@@ -14,10 +14,10 @@
                 {{ csrf_field() }}
                 <input type="hidden" name="data[is_root]" value="1">
                 @include('share.layui-form-item', ['type' => 'input', 'name' => 'name', 'label' => '用户名', 'required' => true, 'value' => (old('data') ? old('data')['name'] : '')])
-                {{--@include('share.layui-form-item', ['type' => 'select', 'name' => 'admin_role_id', 'label' => '角色', 'selected_id' => (old('data') ? old('data')['admin_role_id'] : ''), 'options' => $admin_role_options])--}}
                 {{--@include('share.layui-form-item', ['type' => 'input', 'input_type' => 'input', 'name' => 'mobile', 'label' => '手机号', 'required' => true, 'value' => ''])--}}
                 @include('share.layui-form-item', ['type' => 'input', 'input_type' => 'password', 'name' => 'password', 'label' => '密码', 'required' => true, 'value' => ''])
                 @include('share.layui-form-item', ['type' => 'input', 'input_type' => 'password', 'name' => 'password_confirmation', 'label' => '确认密码', 'required' => true, 'value' => ''])
+                @include('share.layui-form-item', ['type' => 'select', 'name' => 'admin_role_id', 'label' => '角色', 'selected_id' => (old('data') ? old('data')['admin_role_id'] : ''), 'options' => $admin_role_options])
                 <div class="layui-form-item">
                     <div class="layui-input-block">
                         <button class="layui-btn" lay-submit lay-filter="*">提交</button>

resources/views/admin/admin-users/edit.blade.php

@@ -15,10 +15,10 @@
                 <input type="hidden" name="id" value="{{ $item->id }}">
                 <input type="hidden" name="is_root" value="1">
                 @include('share.layui-form-item', ['type' => 'input', 'name' => 'name', 'label' => '用户名', 'required' => true, 'value' => $item->name])
-                {{--@include('share.layui-form-item', ['type' => 'select', 'name' => 'admin_role_id', 'label' => '角色', 'selected_id' => $item->admin_role_id, 'options' => $admin_role_options])--}}
                 {{--@include('share.layui-form-item', ['type' => 'input', 'input_type' => 'input', 'name' => 'mobile', 'label' => '手机号', 'required' => true, 'value' => $item->mobile])--}}
                 @include('share.layui-form-item', ['type' => 'input', 'input_type' => 'password', 'name' => 'password', 'label' => '密码', 'value' => ''])
                 @include('share.layui-form-item', ['type' => 'input', 'input_type' => 'password', 'name' => 'password_confirmation', 'label' => '确认密码', 'value' => ''])
+                @include('share.layui-form-item', ['type' => 'select', 'name' => 'admin_role_id', 'label' => '角色', 'selected_id' => $item->admin_role_id, 'options' => $admin_role_options])
                 <div class="layui-form-item">
                     <div class="layui-input-block">
                         <button class="layui-btn" lay-submit lay-filter="formDemo">提交</button>

resources/views/admin/admin-users/index.blade.php

@@ -17,16 +17,16 @@
         <div class="layui-card-body">
             <form class="layui-form" id="sg-search-form">
                 <div class="layui-form-item layui-row">
-                    {{--<div class="layui-inline">--}}
-                        {{--<div class="layui-input-inline">--}}
-                            {{--<select name="status">--}}
-                                {{--<option value="0">角色</option>--}}
-                                {{--@foreach($admin_role_options as $option)--}}
-                                    {{--<option value="{{ $option['id'] }}">{{ $option['name'] }}</option>--}}
-                                {{--@endforeach--}}
-                            {{--</select>--}}
-                        {{--</div>--}}
-                    {{--</div>--}}
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <select name="admin_role_id">
+                                <option value="0">角色</option>
+                                @foreach($admin_role_options as $option)
+                                    <option value="{{ $option['id'] }}">{{ $option['name'] }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
                             <input type="text" name="name" placeholder="请输入用户名" autocomplete="off" class="layui-input" value="{{ request('name') }}">
@@ -66,7 +66,7 @@
                     cellMinWidth: 80,
                     cols: [[
                         { field: 'name', title: '用户名', align: 'center' },
-                        // { field: 'mobile', title: '手机号', align: 'center' },
+                        { field: 'role_name', title: '角色名', align: 'center' },
                         { field: 'created_at', title: '创建时间', align: 'center' },
                         { field: 'updated_at', title: '更新时间', align: 'center' },
                         { title: '操作', align:'center', toolbar: '#sg-table-bar' }