|
@@ -535,23 +535,23 @@ class WebsiteService implements WebsiteServiceInterface
|
|
{
|
|
{
|
|
|
|
|
|
$depart = Department::where('pid',0)->orderBy('id','asc')->get();
|
|
$depart = Department::where('pid',0)->orderBy('id','asc')->get();
|
|
- if(isset($data['keyword']) && !empty($data['keyword'])){
|
|
|
|
- $departments= Department::where('name', 'like', '%' . $data['keyword'] . '%')->get();
|
|
|
|
- if(empty($departments)){
|
|
|
|
- $result['message']="未查询到与此相关职能部门";
|
|
|
|
- }else{
|
|
|
|
- $count = Department::where('name','like',"%{$data['keyword']}%")->count();
|
|
|
|
- $m = [
|
|
|
|
- 'department'=>$depart,
|
|
|
|
- 'type'=>$departments,
|
|
|
|
- 'count'=>$count
|
|
|
|
- ];
|
|
|
|
- }
|
|
|
|
|
|
+ // if(isset($data['keyword']) && !empty($data['keyword'])){
|
|
|
|
+ // $departments= Department::where('name', 'like', '%' . $data['keyword'] . '%')->get();
|
|
|
|
+ // if(empty($departments)){
|
|
|
|
+ // $result['message']="未查询到与此相关职能部门";
|
|
|
|
+ // }else{
|
|
|
|
+ // $count = Department::where('name','like',"%{$data['keyword']}%")->count();
|
|
|
|
+ // $m = [
|
|
|
|
+ // 'department'=>$depart,
|
|
|
|
+ // 'type'=>$departments,
|
|
|
|
+ // 'count'=>$count
|
|
|
|
+ // ];
|
|
|
|
+ // }
|
|
|
|
|
|
- $result['sele'] = $m;
|
|
|
|
- return Result::success($result['sele']);
|
|
|
|
|
|
+ // $result['sele'] = $m;
|
|
|
|
+ // return Result::success($result['sele']);
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ // }
|
|
$result=$depart;
|
|
$result=$depart;
|
|
return Result::success($result);
|
|
return Result::success($result);
|
|
}
|
|
}
|
|
@@ -650,7 +650,7 @@ class WebsiteService implements WebsiteServiceInterface
|
|
$result[$k]['children_count']=0;
|
|
$result[$k]['children_count']=0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return Result::success($result);
|
|
|
|
|
|
+ // return Result::success($result);
|
|
if(!empty($result)){
|
|
if(!empty($result)){
|
|
return Result::success($result);
|
|
return Result::success($result);
|
|
}else{
|
|
}else{
|