Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -1697,8 +1697,7 @@ class PublicRpcService implements PublicRpcServiceInterface
             if(empty($sector_type)){
                 return Result::error('通栏版式类别不存在！');
             }
-            $component = SectorPlace::where('sector_type', $data['sector_type'])
-            ->where('component_type', $data['type'])
+            $component = SectorPlace::where('component_type', $data['type'])
             ->where('type_id',2)
             ->first();
             if(!empty($component)){
@@ -1749,7 +1748,6 @@ class PublicRpcService implements PublicRpcServiceInterface
                 return Result::error('通栏版式类别不存在！');
             }
             $component = SectorPlace::where('id','!=',$id) 
-            ->where('sector_type', $data['sector_type'])
             ->where('component_type', $data['type'])
             ->where('type_id',2)
             ->first();