Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Logic\Bside\ProjectGroupLogic;
 use App\Http\Logic\Bside\ProjectGroupLogic;
 use App\Http\Requests\Bside\ProjectGroupRequest;
 use App\Http\Requests\Bside\ProjectGroupRequest;
 use App\Models\ProjectGroup as ProjectGroupModel;
 use App\Models\ProjectGroup as ProjectGroupModel;
+use App\Models\User as UserModel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 
 
@@ -27,6 +28,18 @@ class ProjectGroupController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @name:添加用户组获取用户列表
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function get_user_lists(UserModel $userModel){
+        $this->map['project_id'] = $this->user['project_id'];
+        //获取当前项目下的所有用户
+        $lists = $userModel->list($this->map);
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+    /**
      * @param ProjectGroupRequest $request
      * @param ProjectGroupRequest $request
      * @param ProjectGroupLogic $logic
      * @param ProjectGroupLogic $logic
      * @name : 添加用户组
      * @name : 添加用户组

@@ -30,9 +30,9 @@ Route::middleware(['bloginauth'])->group(function () {
     //group相关路由
     //group相关路由
     Route::any('/project_group/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
     Route::any('/project_group/add', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'add'])->name('project_group_add');
     Route::any('/project_group/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
     Route::any('/project_group/edit', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'edit'])->name('project_group_edit');
-    Route::any('/project_group/status', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'status'])->name('project_group_status');
     Route::any('/project_group/lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
     Route::any('/project_group/lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'lists'])->name('project_group_lists');
     Route::any('/project_group/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
     Route::any('/project_group/del', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'del'])->name('project_group_del');
+    Route::any('/project_group/get_user_lists', [\App\Http\Controllers\Bside\ProjectGroupController::class, 'get_user_lists'])->name('project_group_get_user_lists');
 
 
     //产品
     //产品
     Route::prefix('product')->group(function () {
     Route::prefix('product')->group(function () {