Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -974,7 +974,7 @@ class PublicRpcService implements PublicRpcServiceInterface
     {
         $where = [];
         if (isset($data['template_class_id']) && !empty($data['template_class_id'])) {
-            $where['template_class.class_id'] = $data['template_class_id'];
+            $where['template_class.template_class_id'] = $data['template_class_id'];
         }
         if (isset($data['template_id']) && !empty($data['template_id'])) {
             array_push($where, ['template.template_id', $data['template_id']]);
@@ -991,17 +991,19 @@ class PublicRpcService implements PublicRpcServiceInterface
         } else {
             $size_id = [];
         }
-        // $size_id = $size_id->toArray();
         $result = Sector::where($where)
             ->when(!empty($size_id), function ($query) use ($size_id) {
                 $query->whereIn('size_id', $size_id);
             })
             ->leftJoin('size', 'size.id', '=', 'sector.size_id')
-            ->leftJoin('template_class', 'template_class.class_id', '=', 'sector.template_class_id')
             ->leftJoin('template', 'template.template_id', '=', 'sector.template_id')
-            ->select('sector.*', 'size.width', 'size.height', 'template_class.name as class_name', 'template.template_name')
+            ->leftJoin('template_class', 'template_class.class_id', '=', 'template.template_class_id') 
+            ->select('sector.*', 'size.width','size.height','template_class.name as class_name','template.template_name')
             ->orderBy('sector.id', 'desc')
             ->paginate($data['page_size'], ['*'], 'page', $data['page']);
+        if(empty($result)){
+            return Result::error('暂无通栏！');
+        }
         return Result::success($result);
     }
     /**