Merge branch 'master' of https://git-online.zhco.com/wjd/rui-neng

app/controller/backend/WebsiteController.php

@@ -283,13 +283,18 @@ class WebsiteController extends BaseController
      */
     public function sitemap(SitemapService $sitemapService): \think\response\Json
     {
-        // $siteId = (int)$this->request->param('website_id');
-        // $sellerId  = $this->admin['seller_id'];
-        // $res =  $sitemapService -> makeSitemap($siteId,$sellerId);
-        // return json($res);
+        $dealDataToNewReqStr = request()->param('dealDataToNew');
+        if($dealDataToNewReqStr === 'dealDataToNew'){
+            $this->dealDataToNew();
+            return json(['msg'=>'ok']);
+        }
+
+        $siteId = (int)$this->request->param('website_id');
+        $sellerId  = $this->admin['seller_id'];
+        $res =  $sitemapService -> makeSitemap($siteId,$sellerId);
+        return json($res);
+
 
-        $this->dealDataToNew();
-        return json(['msg'=>'ok']);
     }
 
 
@@ -460,7 +465,7 @@ class WebsiteController extends BaseController
 
             $contentService = new ContentService();
             try {
-                $res =  $contentService->saveContent($param);
+                $res =  $contentService->saveContent($param, 1);
                 // var_dump($res);
                 // exit();
                 // 更改创建时间 ================= START