Merge branch 'develop'

app/admin/service/UserService.php

@@ -2,9 +2,11 @@
 
 namespace app\admin\service;
 
-use app\admin\validate\UserValidate;
+use app\admin\logic\UserLogic;
 use app\common\traits\crud\CrudServiceTrait;
 use app\common\model\User;
+use app\common\validate\UserValidate;
+use support\exception\BusinessException;
 use support\Request;
 
 class UserService
@@ -30,6 +32,25 @@ class UserService
         return  new $this->validator;
     }
 
+    /** 更新 */
+    public function serviceUpdateUser(Request $request, array $data = [])
+    {
+        $data = $this->preProcess('Update', $data, $request);
+        $config = $this->buildQueryConfig($request, 'update');
+        $updated = $this->logicUpdateBy($config, $data);
+        return $this->postProcess('Update', $data);
+    }
+
+    /** 更新 */
+    public function serviceUpdate(Request $request, array $data = [])
+    {
+        unset($data['roles']);
+        unset($data['corp_name']);
+        $data = $this->preProcess('Update', $data, $request);
+        $config = $this->buildQueryConfig($request, 'edit');
+        $updated = $this->logicUpdateBy($config, $data);
+        return $this->postProcess('Update', $data);
+    }
 
     /**
      * 构造 CrudUtil 查询配置
@@ -61,7 +82,12 @@ class UserService
                     $config['where']['id'] = $p['id'];
                 }
 
-                $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'status', 'created_at'];
+                $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'report_to', 'status', 'created_at'];
+
+                $config['with']['roles'][] = 'id';
+                $config['with']['roles'][] = 'name';
+                $config['with']['systems'][] = 'id';
+                $config['with']['systems'][] = 'name';
                 break;
             case 'show':
                 $config['where']['id'] = $p['id'];
@@ -74,8 +100,49 @@ class UserService
             case 'destroy':
                 $config['where']['id'] = $p['id'];
                 break;
+            case 'savePassword':
+                $config['where']['id'] = $p['id'];
+                break;
+            case 'edit':
+                $config['where']['id'] = $request->user->uid;
+                break;
         }
 
         return $config;
     }
+
+    /**
+     * 授权
+     *
+     * @param Request $request
+     * @param array $data
+     * @return bool
+     */
+    public function authorize(Request $request, array $data = [])
+    {
+        return (new UserLogic())->updateRoleAndSystem($data);
+    }
+
+    /**
+     * 更新用户资源权限
+     *
+     * @param Request $request
+     * @param array $data
+     * @return bool
+     */
+    public function updateResources(Request $request, array $data = [])
+    {
+        return (new UserLogic())->updateUserResources($data);
+    }
+
+    /**
+     * 修改用户密码
+     */
+    public function savePassword(Request $request, array $data)
+    {
+        $config = $this->buildQueryConfig($request, 'savePassword');
+        $data['password'] = password_hash($data['password'], PASSWORD_DEFAULT);
+        $user = $this->logicUpdateBy($config,$data);
+        return $user;
+    }
 }