gx

@@ -3,11 +3,11 @@
 namespace App\Http\Controllers\Aside\Manage;
 
 use App\Enums\Common\Code;
-use App\Helper\Arr;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Manage\ManageLogic;
 use App\Http\Requests\Aside\Manage\ManageRequest;
 use App\Models\Manage\MenuSpecial;
+use App\Models\User\ProjectRole;
 use App\Rules\Ids;
 use Illuminate\Http\Request;
 
@@ -73,7 +73,7 @@ class ManageController extends BaseController
      */
     public function save(ManageRequest $request, ManageLogic $logic){
         $request->validated();
-        $logic->save($this->param);
+        $logic->managerSave();
         $this->response('success');
     }
 
@@ -110,4 +110,6 @@ class ManageController extends BaseController
         $logic->setParamStatus();
         $this->response('success');
     }
+
+
 }

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\UserLogic;
 use App\Http\Requests\Aside\User\UserRequest;
+use App\Models\User\ProjectRole;
 use App\Models\User\User;
 use App\Models\User\User as UserModel;
 
@@ -119,4 +120,22 @@ class ProjectUserController extends BaseController
         $userLogic->user_del();
         $this->response('success');
     }
+
+    /**
+     * @remark :获取项目角色
+     * @name   :getRole
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/29 13:47
+     */
+    public function getRole(){
+        $this->request->validate([
+            'project_id'=>'required',
+        ],[
+            'project_id.required' => 'project_id不能为空',
+        ]);
+        $roleModel = new ProjectRole();
+        $list =  $roleModel->list($this->map);
+        $this->response('success',Code::SUCCESS,$list);
+    }
 }

@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Manage;
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Manage\Manage;
+use App\Models\Manage\Menu;
 use Illuminate\Support\Facades\Hash;
 
 /**
@@ -22,11 +23,19 @@ class ManageLogic extends  BaseLogic
         $this->model = new Manage();
     }
 
-    public function save($param){
-        if(!empty($param['password'])){
-            $param['password'] = Hash::make($param['password']);
+    public function managerSave(){
+        if(isset($this->param['password']) && !empty($this->param['password'])){
+            $this->param['password'] = Hash::make($this->param['password']);
         }
-        return parent::save($param);
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
+        }else{
+            $rs = $this->model->add($this->param);
+        }
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
     }
 
 
@@ -64,4 +73,6 @@ class ManageLogic extends  BaseLogic
         }
         return $this->success($info);
     }
+
+
 }

@@ -19,6 +19,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/info', [Aside\User\ProjectUserController::class, 'info'])->name('admin.user_info');
         Route::any('/save', [Aside\User\ProjectUserController::class, 'save'])->name('admin.user_save');
         Route::any('/del', [Aside\User\ProjectUserController::class, 'del'])->name('admin.user_del');
+        Route::any('/getRole', [Aside\User\ProjectUserController::class, 'getRole'])->name('admin.user_getRole');
 
         //角色管理
         Route::prefix('role')->group(function () {