Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/public_producer

app/JsonRpc/WebsiteService.php

@@ -2168,7 +2168,7 @@ class WebsiteService implements WebsiteServiceInterface
                 $join->on('website_column.pid', '=', 'parent_column.id')
                     ->where('website_column.pid', 2);
             })
-            ->whereRaw('JSON_CONTAINS(website_column_arr_id,?)', [2])
+            ->whereRaw('NOT JSON_CONTAINS(website_column_arr_id, \'3\')')
             ->select(
                 "website_template_info.id",
                 "template_class.name",
@@ -3366,30 +3366,31 @@ class WebsiteService implements WebsiteServiceInterface
         ];
         $website_template = WebsiteTemplate::where($where)->first();
         unset($data['website_id']);
-        if ($data['status'] == 2) {
-            $template_status = 6;
-        } else {
-            $template_status = 1;
-        }
+        // if($data['status'] == 2){
+        //     $template_status = 6;
+        // }else{
+        //     $template_status = 1;
+
+        // }
         if (empty($website_template)) {
             return Result::error("网站预制模板获取失败", 0);
         } else {
-            Db::beginTransaction();
-            try {
-                $result['website_template'] = WebsiteTemplate::where($where)->update(['status' => $template_status]);
-                if (empty($result['website_template'])) {
-                    return Result::error("修改网站模板状态失败", 0);
-                }
-                $result['website_template_info'] = WebsiteTemplateInfo::where($where)->update(['status' => $data['status']]);
+            // Db::beginTransaction();
+            // try {
+                // $result['website_template'] = WebsiteTemplate::where($where)->update(['status'=>$template_status]);
+                // if (empty($result['website_template'])) {
+                //     return Result::error("修改网站模板状态失败", 0);
+                // }
+                $result['website_template_info'] = WebsiteTemplateInfo::where($where)->update(['status'=>$data['status']]);
                 if (empty($result['website_template_info'])) {
                     return Result::error("修改网站基础信息状态失败", 0);
                 }
-                Db::commit();
+                // Db::commit();
                 return Result::success($result);
-            } catch (\Exception $e) {
-                Db::rollBack();
-                return Result::error($e->getMessage(), 0);
-            }
+            // } catch (\Exception $e) {
+            //     Db::rollBack();
+            //     return Result::error($e->getMessage(), 0);
+            // }
         }
     }
 
@@ -3572,36 +3573,46 @@ class WebsiteService implements WebsiteServiceInterface
             $originalCategories = WebsiteCategory::where('website_id', $data['website_id'])->get();
             // 克隆网站后的新 ID（假设 $clone_website->id 已存在）
             $newWebsiteId = $clone_website->id;
-            // 遍历每条记录并克隆
-            foreach ($originalCategories as $category) {
-                // 使用 replicate() 方法创建模型副本（不包含主键）
-                $clonedCategory = $category->replicate();
-                // 修改外键字段指向新网站 ID
-                $clonedCategory->website_id = $newWebsiteId;
-                // 保存克隆后的记录到数据库
-                $clonedCategory->save();
+            if($originalCategories && count($originalCategories)>0){
+                // 遍历每条记录并克隆
+                foreach ($originalCategories as $category) {
+                    // 使用 replicate() 方法创建模型副本（不包含主键）
+                    $clonedCategory = $category->replicate();
+                    // 修改外键字段指向新网站 ID
+                    $clonedCategory->website_id = $newWebsiteId;
+                    // 保存克隆后的记录到数据库
+                    $clonedCategory->save();
+                }
             }
+
             //克隆友情链接 Link 对应的是多个
             $originalLinks = Link::where('website_id', $data['website_id'])->get();
-            foreach ($originalLinks as $link) {
-                // 使用 replicate() 方法创建模型副本（不包含主键）
-                $clonedLink = $link->replicate();
-                // 修改外键字段指向新网站 ID
-                $clonedLink->website_id = $newWebsiteId;
-                // 保存克隆后的记录到数据库
-                $clonedLink->save();
+            if($originalLinks && count($originalLinks)>0){
+                foreach ($originalLinks as $link) {
+                    // 使用 replicate() 方法创建模型副本（不包含主键）
+                    $clonedLink = $link->replicate();
+                    // 修改外键字段指向新网站 ID
+                    $clonedLink->website_id = $newWebsiteId;
+                    // 保存克隆后的记录到数据库
+                    $clonedLink->save();
+                }
             }
             //克隆网站底部信息 footer_category 表 和footer_content 表 footer_category.id = footer_content.fcat_id 都是一对多关系
             $originalFooterCategories = FooterCategory::where('website_id', $data['website_id'])->get();
-            foreach ($originalFooterCategories as $footerCategory) {
-                $clonedFooterCategory = $footerCategory->replicate();
-                $clonedFooterCategory->website_id = $newWebsiteId;
-                $clonedFooterCategory->save();
-                $originalFooterContents = FooterContent::where('fcat_id', $footerCategory->id)->get();
-                foreach ($originalFooterContents  as $footerContent) {
-                    $clonedFooterContent = $footerContent->replicate();
-                    $clonedFooterContent->fcat_id = $clonedFooterCategory->id;
-                    $clonedFooterContent->save();
+            if($originalFooterCategories && count($originalFooterCategories)>0){
+                foreach ($originalFooterCategories as $footerCategory) {
+                    $clonedFooterCategory = $footerCategory->replicate();
+                    $clonedFooterCategory->website_id = $newWebsiteId;
+                    $clonedFooterCategory->save();
+                    $originalFooterContents = FooterContent::where('fcat_id', $footerCategory->id)->get();
+                    if($originalFooterContents && count($originalFooterContents)>0){
+                        foreach ($originalFooterContents  as $footerContent) {
+                            $clonedFooterContent = $footerContent->replicate();
+                            $clonedFooterContent->fcat_id = $clonedFooterCategory->id;
+                            $clonedFooterContent->save();
+                        }
+                    }
+
                 }
             }
             Db::commit();