浏览代码

修改获取网站底部基本信息相关接口

15313670163 2 月之前
父节点
当前提交
4ed150425a
共有 3 个文件被更改,包括 21 次插入15 次删除
  1. 21 12
      app/JsonRpc/WebsiteService.php
  2. 0 1
      app/Model/FooterContent.php
  3. 0 2
      runtime/container/scan.cache

+ 21 - 12
app/JsonRpc/WebsiteService.php

@@ -1284,19 +1284,28 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function getWebsiteFootInfo(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }
         }else{
             return Result::error("参数错误",0);
         }
-        $websiteInfo = WebsiteTemplateInfo::where('website_id',$data['website_id'])->first();
-        if (empty($websiteInfo)) {
+        $website_foot = WebsiteTemplateInfo::where('website_id',$data['website_id'])->where('status',2)->first();
+        $website_head = Website::where('id',$data['website_id'])
+        ->select('id','website_name','logo','title','keywords','description')->first();
+        if (empty($website_foot)) {
             return Result::error("暂无底部基础信息",0);
         }
-        return Result::success($websiteInfo->toArray());
+        if (empty($website_head)) {
+            return Result::error("暂无头部基础信息",0);
+        }
+        $result = [
+            'website_foot'=>$website_foot,
+            'website_head'=>$website_head
+        ];
+        return Result::success($result);
     }
     /**
      * 获取网站底部导航
@@ -1305,8 +1314,8 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function getWebsiteFooterCategory(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }
@@ -1326,8 +1335,8 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function getWebsiteFooterCategoryList(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }
@@ -1351,14 +1360,14 @@ class WebsiteService implements WebsiteServiceInterface
         return Result::success($result);
     }
     /**
-     * 获取网站底部基础信息
+     * 获取网站底部导航
      * @param array $data
      * @return array
      */
     public function getWebsiteFooterCategoryInfo(array $data): array
     {
-        if(isset($data['website_id'])){
-            $website = Website::query()->where('id',$data['website_id'])->first();
+        if(isset($data['website_id']) && !empty($data['website_id'])){
+            $website = Website::where('id',$data['website_id'])->where('status',1)->first();
             if (empty($website)) {
                 return Result::error("找不到网站",0); 
             }

+ 0 - 1
app/Model/FooterContent.php

@@ -23,5 +23,4 @@ class FooterContent extends Model
      * The attributes that should be cast to native types.
      */
     protected array $casts = [];
-
 }

文件差异内容过多而无法显示
+ 0 - 2
runtime/container/scan.cache


部分文件因为文件数量过多而无法显示