gx

@@ -25,9 +25,7 @@ class LoginController extends BaseController
             'mobile.required' => '请输入手机号',
             'mobile.required' => '请输入手机号',
             'password.required' => '请输入密码',
             'password.required' => '请输入密码',
         ]);
         ]);
-
         $data = $logic->login();
         $data = $logic->login();
-
         return $this->success($data);
         return $this->success($data);
     }
     }
 
 

@@ -34,6 +34,12 @@ class ServiceController extends BaseController
      * @time   :2023/6/25 11:51
      * @time   :2023/6/25 11:51
      */
      */
     public function save(ServiceLogic $serviceLogic){
     public function save(ServiceLogic $serviceLogic){
+        $this->request->validate([
+            'id'=>['required','array'],
+        ], [
+            'data.required' => 'data不能为空',
+            'data.array' => 'data必须为数组',
+        ]);
         $serviceLogic->serviceSave();
         $serviceLogic->serviceSave();
         $this->response('success');
         $this->response('success');
     }
     }

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Aside\User;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\DeptLogic;
 use App\Http\Logic\Aside\User\DeptLogic;
+use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
  * @remark :b端用户组织架构
  * @remark :b端用户组织架构
@@ -47,4 +48,65 @@ class ProjectDeptController extends BaseController
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
 
 
+    /**
+     * @remark :根据组织架构获取用户
+     * @name   :getDeptUser
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/26 10:21
+     */
+    public function getDeptUser(){
+        $query = DB::table('gl_project_user')
+            ->leftJoin('gl_project_dept_user', 'gl_project_user.id', '=', 'gl_project_dept_user.user_id')
+            ->leftJoin('gl_project_dept', 'gl_project_dept_user.dept_id', '=', 'gl_project_dept.id')
+            ->join('gl_project_role', 'gl_project_user.role_id', '=', 'gl_project_role.id')
+            ->orderBy('gl_project_dept_user.id','desc');
+        $query = $this->searchParam($query);
+        $lists = $query->paginate($this->row, $this->selectParam(), 'page', $this->page);
+        return $this->success($lists);
+    }
+
+    /**
+     * @name   :(查询参数设置)selectParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:00
+     */
+    public function selectParam(){
+        $select = [
+            'gl_project_dept_user.dept_id AS dept_id',
+            'gl_project_user.name AS name',
+            'gl_project_user.project_id AS project_id',
+            'gl_project_user.mobile AS mobile',
+            'gl_project_user.email AS email',
+            'gl_project_user.status AS status',
+            'gl_project_user.role_id AS role_id',
+            'gl_project_user.operator_id AS operator_id',
+            'gl_project_dept_user.is_admin AS is_admin',
+            'gl_project_dept.title AS title',
+            'gl_project_dept.pid AS pid',
+            'gl_project_dept.remark AS remark',
+            'gl_project_user.id AS user_id',
+            'gl_project_dept_user.id AS id',
+            'gl_project_role.name AS role_name'
+        ];
+        return $select;
+    }
+    /**
+     * @name   :(搜索参数处理)searchParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 14:58
+     */
+    public function searchParam(&$query){
+        //搜索条件处理
+        if(isset($this->map['name'])){
+            $query = $query->where('gl_project_user.name',$this->map['name'][0],'%'.$this->map['name'][1].'%');
+        }
+        if(isset($this->map['dept_id'])){
+            $query = $query->where('gl_project_dept_user.dept_id',$this->map['dept_id']);
+        }
+        $query = $query->where('gl_project_user.project_id',$this->manage['project_id']);
+        return $query;
+    }
 }
 }

@@ -15,7 +15,7 @@ class DeptLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
-     * @remark :Dept组织价格列表
+     * @remark :Dept组织架构列表
      * @name   :DeptLists
      * @name   :DeptLists
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
@@ -41,4 +41,5 @@ class DeptLogic extends BaseLogic
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
+
 }
 }

@@ -44,6 +44,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::prefix('dept')->group(function () {
         Route::prefix('dept')->group(function () {
             Route::any('/', [Aside\User\ProjectDeptController::class, 'lists'])->name('admin.group_lists');
             Route::any('/', [Aside\User\ProjectDeptController::class, 'lists'])->name('admin.group_lists');
             Route::any('/read', [Aside\User\ProjectDeptController::class, 'read'])->name('admin.group_info');
             Route::any('/read', [Aside\User\ProjectDeptController::class, 'read'])->name('admin.group_info');
+            Route::any('/getDeptUser', [Aside\User\ProjectDeptController::class, 'getDeptUser'])->name('admin.getDeptUser');
         });
         });