gx

@@ -34,7 +34,7 @@ class AyrReleaseController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @name   :(获取当前用户已绑定的社交链接)info
+     * @name   :(获取当前用户已绑定的社交链接)
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/5/9 16:00
      * @time   :2023/5/9 16:00

@@ -12,7 +12,7 @@ class DeptUserController extends BaseController
 {
 {
     /**
     /**
      * @param ViewDeptUser $viewDeptUser
      * @param ViewDeptUser $viewDeptUser
-     * @name   :（列表）lists
+     * @name   :（部门获取成员列表）lists
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/5/17 17:27
      * @time   :2023/5/17 17:27
@@ -23,26 +23,75 @@ class DeptUserController extends BaseController
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
+
     /**
     /**
-     * @name   :(获取成员列表)get_user_list
+     * @param ViewDeptUser $viewDeptUser
+     * @name   :（详情）info
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/5/17 17:38
+     * @time   :2023/5/18 9:32
      */
      */
-    public function get_user_list(DeptUserLogic $deptUserLogic){
-        //获取当前用户已添加的成员
-        $list = $deptUserLogic->get_user_list();
-        $this->response('success',Code::SUCCESS,$list);
+    public function info(ViewDeptUser $viewDeptUser){
+        $this->request->validate([
+            'id'=>['required']
+        ],[
+            'id.required' => 'id不能为空'
+        ]);
+        $info = $viewDeptUser->read($this->param);
+        $this->response('success',Code::SUCCESS,$info);
     }
     }
+
     /**
     /**
-     * @name   :(添加或编辑成员)save
+     * @name   :(部门添加用户)add
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/5/17 17:36
      * @time   :2023/5/17 17:36
      */
      */
     public function add(DeptUserLogic $deptUserLogic){
     public function add(DeptUserLogic $deptUserLogic){
-        $this->param['project_id'] = $this->user['project_id'];
+        $this->request->validate([
+            'dept_id'=>['required'],
+            'user_id'=>['required']
+        ],[
+            'dept_id.required' => '组织架构id不能为空',
+            'user_id.required' => '用户id不能为空',
+        ]);
         $deptUserLogic->dept_user_add();
         $deptUserLogic->dept_user_add();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @name   :(编辑成员)edit
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/18 9:19
+     */
+    public function edit(DeptUserLogic $deptUserLogic){
+        $this->request->validate([
+            'id'=>['required'],
+            'dept_id'=>['required'],
+        ],[
+            'id.required' => 'id不能为空',
+            'dept_id.required' => '组织架构id不能为空',
+        ]);
+        $deptUserLogic->dept_user_edit();
+        $this->response('success');
+    }
+
+    /**
+     * @name   :(设置管理员)set_admin
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/18 10:32
+     */
+    public function set_admin(DeptUserLogic $deptUserLogic){
+        $this->request->validate([
+            'id'=>['required'],
+            'is_admin'=>['required'],
+        ],[
+            'id.required' => 'id不能为空',
+            'is_admin.required' => 'is_admin不能为空',
+        ]);
+        $deptUserLogic->dept_user_edit();
+        $this->response('success');
+    }
 }
 }

@@ -17,39 +17,37 @@ class DeptUserLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @name   :(添加用户时获取成员列表)user_list
+     * @name   :(部门添加用户)dept_user_add
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/5/17 17:40
+     * @time   :2023/5/18 10:21
      */
      */
-    public function get_user_list(){
+    public function dept_user_add(){
         $param = [
         $param = [
+            'dept_id'=> $this->param['dept_id'],
             'project_id'=>$this->user['project_id'],
             'project_id'=>$this->user['project_id'],
-            'dept_id'=>$this->param['dept_id'],
+            'user_id'=>$this->param['user_id'],
+            'operator_id'=>$this->user['id'],
+            'create_id'=>$this->user['id']
         ];
         ];
-        $dept_list = $this->model->list($param,'id');
-        if(!empty($dept_list)){
-            $arr = [];
-            foreach ($dept_list as $k => $v){
-                $arr[] = $v['user_id'];
-            }
+        $rs = $this->model->add($param);
+        if($rs === false){
+            $this->fail('部门添加成员失败');
         }
         }
-        $userModel = new User();
-        $param = [
-            'project_id'=>$this->user['project_id'],
-            'id'=>['not in',$arr],
-        ];
-        $list = $userModel->list($param,'id',['id','name','email','mobile','created_at']);
-        return $this->success($list);
+        return $this->success();
     }
     }
 
 
     /**
     /**
-     * @name   :dept_user_add
+     * @name   :(用户更改部门)dept_user_edit
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/5/17 17:54
      * @time   :2023/5/17 17:54
      */
      */
-    public function dept_user_add(){
-
+    public function dept_user_edit(){
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
     }
     }
 }
 }

@@ -22,7 +22,7 @@ class UserLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function user_info(){
     public function user_info(){
-        $info = $this->info($this->param);
+        $info = $this->model->read($this->param);
         return $this->success($info);
         return $this->success($info);
     }
     }
     /**
     /**
@@ -97,9 +97,9 @@ class UserLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function user_del(){
     public function user_del(){
-        $ids = $this->param['id'];
         $this->param['id'] = ['in',$this->param['id']];
         $this->param['id'] = ['in',$this->param['id']];
-        $this->del($this->param,$ids);
+        $this->model->del($this->param);
+        //对应删除组织架构
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -176,9 +176,9 @@ Route::middleware(['bloginauth'])->group(function () {
         //组织架构
         //组织架构
         Route::prefix('user')->group(function () {
         Route::prefix('user')->group(function () {
             Route::any('/', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'lists'])->name('dept_user');
             Route::any('/', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'lists'])->name('dept_user');
-            Route::any('/get_user_list', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'get_user_list'])->name('dept_user_get_user_list');
+            Route::any('/add', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'add'])->name('dept_user_add');
             Route::any('/info', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'info'])->name('dept_user_info');
             Route::any('/info', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'info'])->name('dept_user_info');
-            Route::post('/save', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'save'])->name('dept_user_save');
+            Route::post('/edit', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'edit'])->name('dept_user_edit');
             Route::any('/delete', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'delete'])->name('dept_user_delete');
             Route::any('/delete', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'delete'])->name('dept_user_delete');
 
 
         });
         });