作者 lyh

gx

@@ -12,6 +12,7 @@ use App\Http\Requests\Aside\Project\ProjectRequest; @@ -12,6 +12,7 @@ use App\Http\Requests\Aside\Project\ProjectRequest;
12 use App\Models\City; 12 use App\Models\City;
13 use App\Models\Inquiry\InquirySet; 13 use App\Models\Inquiry\InquirySet;
14 use App\Models\Manage\BelongingGroup; 14 use App\Models\Manage\BelongingGroup;
  15 +use App\Models\Manage\ManageHr;
15 use App\Models\Project\DeployBuild; 16 use App\Models\Project\DeployBuild;
16 use App\Models\Project\DeployOptimize; 17 use App\Models\Project\DeployOptimize;
17 use App\Models\Project\Payment; 18 use App\Models\Project\Payment;
@@ -261,9 +262,12 @@ class ProjectController extends BaseController @@ -261,9 +262,12 @@ class ProjectController extends BaseController
261 */ 262 */
262 public function getManager(){ 263 public function getManager(){
263 $this->request->validate([ 264 $this->request->validate([
264 - 'id'=>'required', 265 + 'belong_group'=>'required',
265 ],[ 266 ],[
266 - 'id.required' => '请选择用户组' 267 + 'belong_group.required' => '请选择用户组'
267 ]); 268 ]);
  269 + $hrManagerModel = new ManageHr();
  270 + $lists = $hrManagerModel->list(['belong_group'=>$this->param['belong_group']],'id',['id','manage_id','name','entry_position','is_leader']);
  271 + $this->response('success',Code::SUCCESS,$lists);
268 } 272 }
269 } 273 }
@@ -72,8 +72,6 @@ class HrLogic extends BaseLogic @@ -72,8 +72,6 @@ class HrLogic extends BaseLogic
72 public function setJson($str,$param){ 72 public function setJson($str,$param){
73 if(isset($param[$str]) && is_array($param[$str])){ 73 if(isset($param[$str]) && is_array($param[$str])){
74 $param[$str] = json_encode($param[$str]); 74 $param[$str] = json_encode($param[$str]);
75 - }else{  
76 - $param[$str] = '';  
77 } 75 }
78 return $param; 76 return $param;
79 } 77 }