修改权限,角色,用户的CURD 操作错误

Author: big-pang

app/Http/Controllers/Admin/PermissionController.php

@@ -93,10 +93,9 @@ public function create(int $cid)
      */
     public function store(PermissionCreateRequest $request)
     {
-
         $permission = new Permission();
         foreach (array_keys($this->fields) as $field) {
-            $permission->$field = $request->get($field);
+            $permission->$field = $request->get($field,$this->fields[$field]);
         }
         $permission->save();
         Event::fire(new permChangeEvent());
@@ -144,7 +143,7 @@ public function update(PermissionUpdateRequest $request, $id)
     {
         $permission = Permission::find((int)$id);
         foreach (array_keys($this->fields) as $field) {
-            $permission->$field = $request->get($field);
+            $permission->$field = $request->get($field,$this->fields[$field]);
         }
         $permission->save();
         Event::fire(new permChangeEvent());
@@ -167,6 +166,9 @@ public function destroy($id)
                 ->withErrors("请先将该权限的子权限删除后再做删除操作!");
         }
         $tag = Permission::find((int)$id);
+        foreach ($tag->roles as $v){
+            $tag->roles()->detach($v->id);
+        }
         if ($tag) {
             $tag->delete();
         } else {

app/Http/Controllers/Admin/RoleController.php

@@ -17,7 +17,6 @@ class RoleController extends Controller
 {
     protected $fields = [
         'name' => '',
-        'label' => '',
         'description' => '',
         'permissions' => [],
     ];
@@ -173,6 +172,14 @@ public function update(RoleUpdateRequest $request, $id)
     public function destroy($id)
     {
         $role = Role::find((int)$id);
+        foreach ($role->users as $v){
+            $role->users()->detach($v);
+        }
+
+        foreach ($role->permissions as $v){
+            $role->permissions()->detach($v);
+        }
+
         if ($role) {
             $role->delete();
         } else {

app/Http/Controllers/Admin/UserController.php

@@ -94,7 +94,7 @@ public function store(Request $request)
         if (is_array($request->get('roles'))) {
             $user->giveRoleTo($request->get('roles'));
         }
-        event(new \App\Events\userActionEvent('\App\Models\Admin\AdminUser',$user->id,1,'添加了用户'.$user->name));
+        event(new \App\Events\userActionEvent('\App\Models\Admin\AdminUser', $user->id, 1, '添加了用户' . $user->name));
         return redirect('/admin/user')->withSuccess('添加成功！');
     }
 
@@ -131,7 +131,7 @@ public function edit($id)
         }
         $data['rolesAll'] = Role::all()->toArray();
         $data['id'] = (int)$id;
-        event(new \App\Events\userActionEvent('\App\Models\Admin\AdminUser',$user->id,3,'编辑了用户'.$user->name));
+        event(new \App\Events\userActionEvent('\App\Models\Admin\AdminUser', $user->id, 3, '编辑了用户' . $user->name));
         return view('admin.user.edit', $data);
     }
 
@@ -158,8 +158,8 @@ public function update(Request $request, $id)
         }
 
         unset($user->roles);
-        
-        $user->giveRoleTo($request->get('roles',[]));
+
+        $user->giveRoleTo($request->get('roles', []));
 
         return redirect('/admin/user')->withSuccess('添加成功！');
     }
@@ -173,6 +173,9 @@ public function update(Request $request, $id)
     public function destroy($id)
     {
         $tag = User::find((int)$id);
+        foreach ($tag->roles as $v) {
+            $tag->roles()->detach($v);
+        }
         if ($tag && $tag->id != 1) {
             $tag->delete();
         } else {

app/Http/Requests/PermissionCreateRequest.php

@@ -24,7 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'name'=>'required|unique:permissions|max:255',
+            'name'=>'required|unique:admin_permissions|max:255',
             'label'=>'required|max:255',
             'cid'=>'required|int',
         ];

app/Http/Requests/PermissionUpdateRequest.php

@@ -24,8 +24,8 @@ public function authorize()
     public function rules()
     {
         return [
-            'name'=>'required|unique:permissions,name,'.$this->get('id').'|max:255',
-            'label'=>'unique:permissions,label,'.$this->get('id').'|max:255',
+            'name'=>'required|unique:admin_permissions,name,'.$this->get('id').'|max:255',
+            'label'=>'unique:admin_permissions,label,'.$this->get('id').'|max:255',
             'cid'=>'int',
         ];
     }

app/Http/Requests/RoleCreateRequest.php

@@ -24,7 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'name'=>'required|unique:roles|max:255',
+            'name'=>'required|unique:admin_roles|max:255',
         ];
     }
 }

app/Http/Requests/RoleUpdateRequest.php

@@ -24,7 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'name'=>'required|unique:roles,name,'.$this->get('id').'|max:255',
+            'name'=>'required|unique:admin_roles,name,'.$this->get('id').'|max:255',
         ];
     }
 }

app/Models/Admin/AdminUser.php

@@ -26,7 +26,7 @@ class AdminUser extends Authenticatable
     //用户角色
     public function roles()
     {
-        return $this->belongsToMany(Role::class,'admin_role_user','role_id','user_id');
+        return $this->belongsToMany(Role::class,'admin_role_user','user_id','role_id');
     }
 
     // 判断用户是否具有某个角色

app/Models/Admin/Role.php

@@ -12,7 +12,10 @@ public function permissions()
     {
         return $this->belongsToMany(Permission::class,'admin_permission_role','role_id','permission_id');
     }
-
+    public function users()
+    {
+        return $this->belongsToMany(AdminUser::class,'admin_role_user','role_id','user_id');
+    }
     //给角色添加权限
     public function givePermissionTo($permission)
     {

resources/views/admin/permission/index.blade.php

@@ -71,7 +71,7 @@ class="btn btn-warning btn-md animation-shake reloadBtn"><i class="fa fa-mail-re
                 <div class="modal-body">
                     <p class="lead">
                         <i class="fa fa-question-circle fa-lg"></i>
-                        确认要删除这个软件吗?
+                        确认要删除这个权限吗?
                     </p>
                 </div>
                 <div class="modal-footer">