Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -814,7 +814,7 @@ class PublicRpcService implements PublicRpcServiceInterface
             array_push($where, ['template_keyword', 'like', '%'. $data['template_keyword']. '%']);
         }
         $result = Template::where($where)
-            ->leftJoin('template_class', 'template.template_class_id', 'template_class.id')
+            ->leftJoin('template_class', 'template.template_class_id', 'template_class.class_id')
             ->select('template.*', 'template_class.name as template_class_name')
             ->orderBy('template.id', 'desc')
             ->paginate($data['page_size'], ['*'], 'mypage_name', $data['page']);
@@ -826,7 +826,7 @@ class PublicRpcService implements PublicRpcServiceInterface
     public function getTemplateInfo(array $data): array
     {
         $result = Template::where('template.id', $data['id'])
-            ->leftJoin('template_class', 'template.template_class_id', 'template_class.id')
+            ->leftJoin('template_class', 'template.template_class_id', 'template_class.class_id')
             ->select('template.*', 'template_class.name as template_class_name')
             ->first();
         if(empty($result)){