Merge branch '20250522_diywebfr'

app/JsonRpc/PublicRpcService.php

@@ -875,7 +875,14 @@ class PublicRpcService implements PublicRpcServiceInterface
     {
         $rector = Sector::where('template_id', $data['id'])->first();
         if (!empty($rector)) {
-            return Result::error("此皮肤已被绑定，不可删除", 0);
+            return Result::error("此皮肤已被绑定通栏，不可删除", 0);
+        }
+        $template = WebsiteTemplateInfo::where('template_id', $data['id'])->first();
+        if(empty($template)){
+            return Result::error("此皮肤已被绑定网站，不可删除", 0);
+        }
+        if($template->type == 1){
+            return Result::error("默认皮肤不能删除", 0);
         }
         $result = Template::where('id', $data['id'])->delete();
         var_dump($result, '-------------------delete');
@@ -1327,6 +1334,8 @@ class PublicRpcService implements PublicRpcServiceInterface
                 $escapedKeyword = addcslashes($data['keyword'], '%_'); // 转义通配符
                 $where[] = [DB::raw("JSON_EXTRACT(template_keyword, '$[*]') LIKE ?"), "%$escapedKeyword%"];
             }
+        }else{
+            $query = Template::where($where);
         }
         $template_id = WebsiteTemplateInfo::where('website_id', $data['website_id'])->first(['template_id', 'page_type']);
         // return Result::success($template_id);
@@ -1340,16 +1349,11 @@ class PublicRpcService implements PublicRpcServiceInterface
         }
         // 确保 $template_page 为有效数据，避免 SQL 注入风险，这里使用参数绑定
         $template_page_str = json_encode($template_page);
-        if (isset($query)) {
-            $result['template'] = $query->where($where)
-                ->whereRaw("JSON_CONTAINS(template.page_type, ?)", [$template_page_str])
-                ->paginate($data['page_size'], ['*'], 'page', $data['page']);
-        } else {
-            $result['template'] = Template::where($where)
-                ->whereRaw("JSON_CONTAINS(template.page_type, ?)", [$template_page_str])
-                ->paginate($data['page_size'], ['*'], 'page', $data['page']);
-        }
-        if (empty($result['template']['data'])) {
+        $result['template'] = $query->where($where)
+            ->whereRaw("JSON_CONTAINS(template.page_type, ?)", [$template_page_str])
+            ->orderBy('updated_at','desc')
+            ->paginate($data['page_size'], ['*'], 'page', $data['page']);
+        if (empty($result['template'])) {
             $result['template'] = Template::orderBy('updated_at','desc')
                 ->paginate($data['page_size'], ['*'], 'page', $data['page']);
         }