|
@@ -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);
|
|
}
|
|
}
|
|
@@ -564,51 +564,14 @@ class WebsiteService implements WebsiteServiceInterface
|
|
*/
|
|
*/
|
|
public function selectWebsiteArea(array $data): array
|
|
public function selectWebsiteArea(array $data): array
|
|
{
|
|
{
|
|
- $provinces=District::where('pid',0)->where('status',1)->orderBy('code')->get();
|
|
|
|
-
|
|
|
|
- if(isset($data['province'])){
|
|
|
|
- $province=District::where('pid',0)->where('status',1)->where('id',$data['province'])->orderBy('code')->get();
|
|
|
|
- $province=$province->toArray();
|
|
|
|
- if(!empty($province)){
|
|
|
|
- $citys=District::where('pid',$data['province'])->where('status',1)->orderBy('code')->get();
|
|
|
|
- if(!empty($citys) && isset($data['city']) && !empty($data['city'])){
|
|
|
|
- // $province = $province->toArray();
|
|
|
|
- $province_id=[];
|
|
|
|
- foreach($province as $val){
|
|
|
|
- array_push($province_id,$val['id']);
|
|
|
|
- }
|
|
|
|
- // var_dump($province_id);
|
|
|
|
- $city=District::whereIn('pid',$province_id)->where('status',1)->where('id',$data['city'])->orderBy('code')->get();
|
|
|
|
- if(!empty($city)){
|
|
|
|
- $city_id=[];
|
|
|
|
- foreach($city as $val){
|
|
|
|
- array_push($city_id,$val['id']);
|
|
|
|
- }
|
|
|
|
- $regions=District::whereIn('pid',$city_id)->where('status',1)->orderBy('code')->get();
|
|
|
|
-
|
|
|
|
- $result=[
|
|
|
|
- 'province' => $province,
|
|
|
|
- 'city' => $city,
|
|
|
|
- 'region' => $regions
|
|
|
|
- ];
|
|
|
|
- }else{
|
|
|
|
- return Result::error("未查询到此城市",0);
|
|
|
|
- }
|
|
|
|
- }else{
|
|
|
|
- $result=[
|
|
|
|
- 'province' => $province,
|
|
|
|
- 'city' => $citys,
|
|
|
|
- 'region' => null
|
|
|
|
- ];
|
|
|
|
- }
|
|
|
|
- }else{
|
|
|
|
- return Result::error("未查询到此省份",0);
|
|
|
|
- }
|
|
|
|
|
|
+ // return Result::success($data);
|
|
|
|
+ $pid = $data['pid'] ?? 0;
|
|
|
|
+ $result = District::where('pid',$pid)->where('status',1)->orderBy('code')->get();
|
|
|
|
+ if(empty($result)){
|
|
|
|
+ return Result::error("未查询到此地区",0);
|
|
}else{
|
|
}else{
|
|
- // $keys = array('data');
|
|
|
|
- $result = $provinces;
|
|
|
|
- }
|
|
|
|
- return Result::success($result);
|
|
|
|
|
|
+ return Result::success($result);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|