Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -2171,20 +2171,21 @@ class PublicRpcService implements PublicRpcServiceInterface
             array_push($where,['sector_place.name', 'like', '%'.$data['name'].'%']);
         } 
         if (isset($data['width']) && !empty($data['width']) && isset($data['height']) && !empty($data['height'])){
-            $size_id = Size::where('width','like','%' .$data['width'].'%')->where('height','like','%' .$data['height'].'%')->pluck('id');
+            array_push($where,['sector_place.width','like','%'.$data['width'].'%']);
+            array_push($where,['sector_place.height','like','%'.$data['height'].'%']);
         } else if( isset($data['width']) && !empty($data['width'])){
-            $size_id = Size::where('width','like','%' .$data['width'].'%')->pluck('id');
+            array_push($where,['sector_place.width','like','%'.$data['width'].'%']);
         }else if( isset($data['height']) && !empty($data['height'])){
-            $size_id = Size::where('height','like','%' .$data['height'].'%')->pluck('id');
+            array_push($where,['sector_place.height','like','%'.$data['height'].'%']);
         }else{
             $size_id = [];
         }
         $sector_place = SectorPlace::where($where)
-            ->when(!empty($size_id), function ($query) use ($size_id) {
-                $query->whereIn('sector_place.size_id', $size_id);
-            })
-            ->leftJoin('size','sector_place.size_id','=','size.id')
-            ->select('sector_place.*','size.width','size.height');
+            // ->when(!empty($size_id), function ($query) use ($size_id) {
+            //     $query->whereIn('sector_place.size_id', $size_id);
+            // })
+            // ->leftJoin('size','sector_place.size_id','=','size.id')
+            ->select('sector_place.*');
         $result['count'] = $sector_place->count();
         $result['row'] =$sector_place->paginate($data['page_size'], ['*'], 'page', $data['page']);
         if(empty($result['count'])){