Merge remote-tracking branch 'origin/master' into akun

@@ -139,13 +139,13 @@ class ProjectUserController extends BaseController
      * @time   :2023/8/29 13:47
      * @time   :2023/8/29 13:47
      */
      */
     public function getRole(){
     public function getRole(){
-        $this->request->validate([
-            'project_id'=>'required',
-        ],[
-            'project_id.required' => 'project_id不能为空',
-        ]);
         $roleModel = new ProjectRole();
         $roleModel = new ProjectRole();
-        $list =  $roleModel->list($this->map);
+        $list =  $roleModel->lists($this->map,$this->page,$this->row,$this->order);
+        $projectModel = new Project();
+        foreach ($list['list'] as $k => $v){
+            $v['project_name'] = $projectModel->getProjectName($v['project_id']);
+            $list['list'][$k] = $v;
+        }
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
 
 

@@ -36,7 +36,7 @@ class ProjectRoleController extends BaseController
      */
      */
     public function get_user_list(){
     public function get_user_list(){
         $userModel = new UserModel();
         $userModel = new UserModel();
-        $list = $userModel->list(['role_id'=>$this->param['id']],'id',['id','name','mobile']);
+        $list = $userModel->list(['role_id'=>$this->param['id'],'project_id'=>$this->user['project_id']],'id',['id','name','mobile']);
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
     /**
     /**

@@ -115,10 +115,8 @@ class HrLogic extends BaseLogic
             //同步更新管理员手机号码
             //同步更新管理员手机号码
             $managerModel->edit(['mobile'=>$this->param['mobile']],['id'=>$hrInfo['manage_id']]);
             $managerModel->edit(['mobile'=>$this->param['mobile']],['id'=>$hrInfo['manage_id']]);
             $this->model->edit($this->param,['id'=>$this->param['id']]);
             $this->model->edit($this->param,['id'=>$this->param['id']]);
-
             //同步到B端演示项目
             //同步到B端演示项目
             $this->syncBProjectUser($hrInfo['mobile'], $this->param['mobile'], $this->param['name'], $this->param['status']);
             $this->syncBProjectUser($hrInfo['mobile'], $this->param['mobile'], $this->param['name'], $this->param['status']);
-
             DB::commit();
             DB::commit();
         }catch (\Exception $e){
         }catch (\Exception $e){
             DB::rollBack();
             DB::rollBack();

@@ -378,7 +378,7 @@ class Project extends Base
     public function getProjectName($id){
     public function getProjectName($id){
         $title = '';
         $title = '';
         if(!empty($id)){
         if(!empty($id)){
-            $info = $this->read(['id'=>$id]);
+            $info = $this->read(['id'=>$id],['title']);
             if($info !== false){
             if($info !== false){
                 $title = $info['title'];
                 $title = $info['title'];
             }
             }