修改获取地区排序、获取全部职能部门

app/JsonRpc/WebsiteService.php

@@ -534,7 +534,7 @@ class WebsiteService implements WebsiteServiceInterface
     public function selectWebsiteDepartment(array $data): array
     {
 
-        $depart = Department::where('pid',0)->orderBy('id','asc')->limit(10)->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)){
@@ -567,10 +567,10 @@ class WebsiteService implements WebsiteServiceInterface
         $provinces=District::where('pid',0)->where('status',1)->get();
        
         if(isset($data['province'])){ 
-            $province=District::where('pid',0)->where('status',1)->where('id',$data['province'])->orderBy('id')->get();
+            $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('id')->get();
+                $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=[];
@@ -578,13 +578,13 @@ class WebsiteService implements WebsiteServiceInterface
                         array_push($province_id,$val['id']); 
                     }
                     // var_dump($province_id);
-                    $city=District::whereIn('pid',$province_id)->where('status',1)->where('id',$data['city'])->orderBy('id')->get();
+                    $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('id')->get();
+                        $regions=District::whereIn('pid',$city_id)->where('status',1)->orderBy('code')->get();
                        
                             $result=[
                                 'province' => $province,
@@ -636,8 +636,7 @@ class WebsiteService implements WebsiteServiceInterface
         // ->with(['children' => function ($query) use ($data) {
         //     $query->where('website_category.website_id', $data['website_id']);
         // }])
-        ->orderBy('website_category.sort')
-        
+        ->orderBy('website_category.sort')  
         ->offset($placeid)
         ->limit($num)
         ->get();