Merge branch 'develop'

app/admin/service/CorpFeishuAppService.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace app\admin\service;
+
+use app\common\validate\CorpFeishuAppValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\CorpFeishuApp;
+use support\Request;
+
+class CorpFeishuAppService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = CorpFeishuApp::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = CorpFeishuAppValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    protected function buildQueryConfig(Request $request, string $scene = 'index'): array
+    {
+        $p = $request->all();
+        
+        $config = [];
+        $config['model'] = $this->modelClass;
+        switch ($scene) {
+            case 'index':
+                $config['where']['status'] = 1;
+                $config['order']['sort'] = 'desc';
+                $config['order']['id'] = 'desc';
+
+                $config['with']['corpInfo'][] = 'name';
+                $config['with']['systemInfo'][] = 'name';
+                break;
+            case 'show':
+                $config['where']['id'] = $p['id'];
+                $config['where']['status'] = 1;
+
+                $config['with']['corpInfo'][] = 'name';
+                $config['with']['systemInfo'][] = 'name';
+                break;
+            case 'store':
+                break;
+            case 'update':
+                $config['where']['id'] = $p['id'];
+                break;
+            case 'destroy':
+                $config['where']['id'] = $p['id'];
+                break;
+        }
+        
+        return $config;
+    }
+}

app/admin/service/CountryService.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace app\admin\service;
+
+use app\common\validate\CountryValidate;
+use app\common\traits\crud\CrudServiceTrait;
+use app\common\model\CorpFeishuApp;
+
+class CountryService
+{
+
+    use CrudServiceTrait;
+
+    /**
+     * 指定当前要操作的模型
+     */
+    protected string $modelClass = CorpFeishuApp::class;
+
+    /**
+     * 验证器
+     */
+    protected $validator = CountryValidate::class;
+
+    /**
+     * 获取验证器
+     */
+    public function getValidator()
+    {
+        return  new $this->validator;
+    }
+}

app/admin/service/RoleService.php

@@ -2,9 +2,11 @@
 
 namespace app\admin\service;
 
+use app\common\logic\RoleLogic;
 use app\common\validate\RoleValidate;
 use app\common\traits\crud\CrudServiceTrait;
 use app\common\model\Role;
+use support\Db;
 
 class RoleService
 {
@@ -28,4 +30,21 @@ class RoleService
     {
         return  new $this->validator;
     }
+
+    /**
+     * 获取角色资源
+     */
+    public function menuResource($request, $data)
+    {
+        return (new RoleLogic)->updateRoleResources($data);
+    }
+
+
+    public function getList()
+    {
+        $config['where']['status'] = 1;
+        $config['order']['sort'] = 'asc';
+        $config['order']['id'] = 'asc';
+        return $this->logicListAll($config);
+    }
 }

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;
+    }
 }