gx

@@ -10,19 +10,6 @@ use App\Models\User\ViewDeptUser;
 
 class DeptUserController extends BaseController
 {
-    /**
-     * @param ViewDeptUser $viewDeptUser
-     * @name   :（部门获取成员列表）lists
-     * @author :lyh
-     * @method :post
-     * @time   :2023/5/17 17:27
-     */
-    public function lists(ViewDeptUser $viewDeptUser){
-        $this->param['project_id'] = $this->user['project_id'];
-        $lists = $viewDeptUser->lists($this->map,$this->page,$this->row,$this->order);
-        $this->response('success',Code::SUCCESS,$lists);
-    }
-
 
     /**
      * @param ViewDeptUser $viewDeptUser
@@ -42,12 +29,12 @@ class DeptUserController extends BaseController
     }
 
     /**
-     * @name   :(部门添加用户)add
+     * @name   :(部门添加与更新用户)add
      * @author :lyh
      * @method :post
      * @time   :2023/5/17 17:36
      */
-    public function add(DeptUserLogic $deptUserLogic){
+    public function save(DeptUserLogic $deptUserLogic){
         $this->request->validate([
             'dept_id'=>['required'],
             'user_id'=>['required']
@@ -55,25 +42,7 @@ class DeptUserController extends BaseController
             'dept_id.required' => '组织架构id不能为空',
             'user_id.required' => '用户id不能为空',
         ]);
-        $deptUserLogic->dept_user_add();
-        $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();
+        $deptUserLogic->dept_user_save();
         $this->response('success');
     }
 

@@ -8,6 +8,7 @@ use App\Http\Controllers\Bside\json;
 use App\Http\Logic\Bside\User\UserLogic;
 use App\Http\Requests\Bside\User\UserRequest;
 use App\Models\User\User as UserModel;
+use App\Models\User\ViewDeptUser;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
@@ -19,10 +20,9 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function lists(UserModel $userModel){
-        //TODO::搜索参数统一处理
+    public function lists(ViewDeptUser $viewDeptUser){
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,['id','name','mobile','created_at','wechat','status']);
+        $lists = ViewDeptUser->lists($this->map,$this->page,$this->row,'user_id');
         if(empty($lists)){
             $this->response('error',Code::USER_ERROR,[]);
         }

@@ -15,6 +15,23 @@ class DeptUserLogic extends BaseLogic
         $this->model = new DeptUser();
         $this->param = $this->requestAll;
     }
+    /**
+     * @name   :(部门添加用户)dept_user_add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/18 10:21
+     */
+    public function dept_user_save(){
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $rs = $this->dept_user_edit($this->param);
+        }else{
+            $rs = $this->dept_user_add();
+        }
+        if ($rs === false) {
+            $this->fail('部门添加成员失败');
+        }
+        return $this->success();
+    }
 
     /**
      * @name   :(部门添加用户)dept_user_add
@@ -43,8 +60,8 @@ class DeptUserLogic extends BaseLogic
      * @method :post
      * @time   :2023/5/17 17:54
      */
-    public function dept_user_edit(){
-        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+    public function dept_user_edit($param){
+        $rs = $this->model->edit($param,['id'=>$this->param['id']]);
         if($rs === false){
             $this->fail('error');
         }

@@ -175,10 +175,8 @@ Route::middleware(['bloginauth'])->group(function () {
         //成员管理
         //组织架构
         Route::prefix('user')->group(function () {
-            Route::any('/', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'lists'])->name('dept_user');
-            Route::any('/add', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'add'])->name('dept_user_add');
+            Route::any('/save', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'save'])->name('dept_user_add');
             Route::any('/info', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'info'])->name('dept_user_info');
-            Route::post('/edit', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'edit'])->name('dept_user_edit');
             Route::any('/set_admin', [\App\Http\Controllers\Bside\User\DeptUserController::class, 'set_admin'])->name('dept_user_set_admin');
 
         });