fix(control): 获取用户与角色功能完成

Author: lisgroup

laravel/app/Http/Controllers/Api/RoleController.php

@@ -115,15 +115,14 @@ public function edit($id)
      * @param  int $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Update $request)
+    public function update(Update $request, $id)
     {
-        $id = 3;
         $role = Role::findOrFail($id); // 通过给定id获取角色
         // 验证 name 和 permission 字段
-        $this->validate($request, [
-            'name' => 'required|max:10|unique:roles,name,'.$id,
-            'permissions' => 'required',
-        ]);
+        // $this->validate($request, [
+        //     'name' => 'required|max:10|unique:roles,name,'.$id,
+        //     'permissions' => 'required',
+        // ]);
 
         $input = $request->only(['name']);
         $permissions = $request['checkedPermissions'];

laravel/app/Http/Controllers/Api/UserController.php

@@ -3,7 +3,8 @@
 namespace App\Http\Controllers\Api;
 
 use App\Http\Repository\UserRepository;
-use App\Http\Requests\StoreUserRequest;
+use App\Http\Requests\User\Store;
+use App\Http\Requests\User\Update;
 use App\Role;
 use App\User;
 use Illuminate\Http\Request;
@@ -53,18 +54,18 @@ public function create()
      * Store a newly created resource in storage.
      * 新增入库操作
      *
-     * @param  StoreUserRequest $request
+     * @param  Store $request
      * @return \Illuminate\Http\Response
      */
-    public function store(StoreUserRequest $request)
+    public function store(Store $request)
     {
         // 会出现 Unknown column 'guid' in 'field list' 不存在的字段入库报错问题
         // $rs = User::insert($request->all());
         $input = $request->all();
         $model = new User($input);
         if ($model->save()) {
 
-            $roles = $request['roles']; // 获取输入的角色字段
+            $roles = $request['checkedRoles']; // 获取输入的角色字段
             // 检查是否某个角色被选中
             if (isset($roles)) {
                 foreach ($roles as $role) {
@@ -114,23 +115,26 @@ public function edit($id)
      * Update the specified resource in storage.
      * 更新数据
      *
-     * @param  StoreUserRequest $request
+     * @param  Update $request
      * @param  int $id
      *
      * @return \Illuminate\Http\Response
      */
-    public function update(StoreUserRequest $request, $id)
+    public function update(Update $request, $id)
     {
         $user = User::findOrFail($id);
         // 新增角色操作
         $input = $request->only(['name', 'email', 'password']); // 获取 name, email 和 password 字段
-        $roles = $request['roles']; // 获取所有角色
+        if (empty($input['password'])) {
+            unset($input['password']);
+        }
+        $roles = $request['checkedRoles']; // 获取所有角色
 
         if ($user->fill($input)->save()) {
             if (isset($roles)) {
                 $user->roles()->sync($roles);  // 如果有角色选中与用户关联则更新用户角色
             } else {
-                $user->roles()->detach(); // 如果没有选择任何与用户关联的角色则将之前关联角色解除
+                $user->roles()->detach(\Auth::id()); // 如果没有选择任何与用户关联的角色则将之前关联角色解除
             }
 
             return $this->out(200, ['data' => ['id' => $id]]);

laravel/app/Http/Requests/StoreUserRequest.php renamed to laravel/app/Http/Requests/User/Store.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class StoreUserRequest extends FormRequest
+class Store extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.

laravel/app/Http/Requests/User/Update.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Requests\User;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class Update extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * 获取适用于请求的验证规则
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|between:5,80',
+            'email' => 'email|max:255',
+            'password' => 'max:80',
+        ];
+    }
+
+    /**
+     * 中文错误提示
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'name.required' => '名称不能为空',
+            'name.between' => '名称输入有误',
+            'email.email' => '邮箱格式有误',
+            'email.max' => 'cid 输入有误',
+            'password.between' => '密码输入有误',
+        ];
+    }
+}

laravel/app/Role.php

@@ -32,4 +32,34 @@ public function revokePermissionTo($permission)
     {
         return $this->permissions()->delete($permission);
     }
+
+    /**
+     * 用户增加角色
+     *
+     * @param $roles
+     *
+     * @return bool
+     */
+    public function sync($roles)
+    {
+        $flag = true;
+        foreach ($roles as $role) {
+            if ($this->save($role)) {
+                $flag = false;
+            }
+        }
+        return $flag;
+    }
+
+    /**
+     * 用户删除角色
+     *
+     * @param $user_id
+     *
+     * @return mixed
+     */
+    public function detach($user_id)
+    {
+        return $this->where('user_id', $user_id)->delete();
+    }
 }