修改获取并搜索网站模板信息

app/JsonRpc/WebsiteService.php

@@ -1113,8 +1113,6 @@ class WebsiteService implements WebsiteServiceInterface
         if(isset($data['status'])){
             $query->where('website_template_info.status', $data['status']);
         }
-
-        
         $count = $query->count();
         $query->limit($data['pageSize'])
         ->offset(($data['page'] - 1) * $data['pageSize'])
@@ -1123,6 +1121,15 @@ class WebsiteService implements WebsiteServiceInterface
         if($rep->count()==0){
             return Result::error("没有查找到相关数据",0);
         } else {
+            $rep->each(function ($item) {
+                if (!empty($item->page_type)) {
+                    $pageTypeArray = json_decode($item->page_type, true);
+                    if (is_array($pageTypeArray)) {
+                        $item->page_type = $pageTypeArray;
+                    }
+                }
+            });
+            
             $result = [
                 "rows" => $rep->toArray(),
                 "count" => $count

runtime/hyperf.pid

@@ -1 +1 @@
-31305
+40325

runtime/logs/hyperf.log

@@ -1398,3 +1398,45 @@
 [2024-12-30T13:57:29.594777+08:00] sql.INFO: [15.66] select count(*) as aggregate from `template` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}') and json_contains(`template_img`, '{"value":"7"}')) [] []
 [2024-12-30T13:57:48.217029+08:00] sql.INFO: [19.42] select * from `website_template_info` where `website_id` = '1' limit 1 [] []
 [2024-12-30T13:57:48.234109+08:00] sql.INFO: [16.19] select `template`.`template_name`, `template`.`template_img`, `template`.`id` as `tid`, `template_class`.`name`, `template_class`.`id` as `class_id`, `website_template_info`.* from `website_template_info` left join `template` on `template`.`id` = `website_template_info`.`template_id` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where (`website_template_info`.`website_id` = '1' and `template_id` is not null) and (json_contains(`template`.`template_img`, '{"value":"1"}') or json_contains(`template`.`template_img`, '{"value":"2"}') or json_contains(`template`.`template_img`, '{"value":"7"}')) limit 1 [] []
+[2024-12-30T14:41:49.779917+08:00] sql.INFO: [59.71] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:41:49.799066+08:00] sql.INFO: [15.56] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 10 [] []
+[2024-12-30T14:41:53.111633+08:00] sql.INFO: [16.96] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:41:53.129735+08:00] sql.INFO: [17.52] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:41:59.799856+08:00] sql.INFO: [14.56] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:41:59.817177+08:00] sql.INFO: [16.67] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:46:26.783018+08:00] sql.INFO: [81.84] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:46:26.807479+08:00] sql.INFO: [17.94] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:46:31.330699+08:00] sql.INFO: [1083.13] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:46:31.351300+08:00] sql.INFO: [17.27] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:51:08.733002+08:00] sql.INFO: [61.18] select * from `website` where `website`.`id` = '7' limit 1 [] []
+[2024-12-30T14:51:08.764873+08:00] sql.INFO: [16.57] select * from `website_template_info` where `website_id` = '7' limit 1 [] []
+[2024-12-30T14:51:13.133001+08:00] sql.INFO: [15.84] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:51:13.151167+08:00] sql.INFO: [17.54] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:51:14.166937+08:00] sql.INFO: [15.74] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:51:14.185808+08:00] sql.INFO: [18.27] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:51:15.199841+08:00] sql.INFO: [17.01] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:51:15.217537+08:00] sql.INFO: [16.97] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:52:24.099222+08:00] sql.INFO: [60.91] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:52:24.117791+08:00] sql.INFO: [14.68] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:52:25.767475+08:00] sql.INFO: [14.78] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:52:25.784435+08:00] sql.INFO: [16.44] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:52:46.300982+08:00] sql.INFO: [14.9] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:52:46.318236+08:00] sql.INFO: [16.79] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:52:49.585935+08:00] sql.INFO: [61.67] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:52:49.607670+08:00] sql.INFO: [17.04] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:54:29.648233+08:00] sql.INFO: [63.1] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:54:29.669893+08:00] sql.INFO: [17.81] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:54:33.530108+08:00] sql.INFO: [57.94] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:54:33.548762+08:00] sql.INFO: [15.55] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:54:46.824717+08:00] sql.INFO: [16.67] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:54:46.841061+08:00] sql.INFO: [15.67] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:54:47.886577+08:00] sql.INFO: [15.26] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:54:47.919562+08:00] sql.INFO: [32.19] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:54:51.404734+08:00] sql.INFO: [273.67] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:54:51.425907+08:00] sql.INFO: [16.16] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T14:57:56.061048+08:00] sql.INFO: [65.08] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T14:57:56.081729+08:00] sql.INFO: [17.41] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T15:00:46.141597+08:00] sql.INFO: [272.05] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T15:00:46.160018+08:00] sql.INFO: [17.73] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-30T15:00:49.112077+08:00] sql.INFO: [60.71] select count(*) as aggregate from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' [] []
+[2024-12-30T15:00:49.133212+08:00] sql.INFO: [16.93] select `website`.`website_name`, `website`.`website_url`, `website_template_info`.`id` as `tid`, `website_template_info`.`created_at`, `website_template_info`.`updated_at`, `website_template_info`.`page_type`, COALESCE(website_template_info.status, 0) as template_status, `template`.`template_name` from `website` left join `website_template_info` on `website_template_info`.`website_id` = `website`.`id` left join `template` on `template`.`id` = `website_template_info`.`template_id` where `website`.`status` = '1' order by `website_template_info`.`updated_at` desc limit 10 offset 0 [] []