Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -119,11 +119,12 @@ class CustomTemplateController extends BaseController
      */
      */
     public function getCustomTemplateLog(BTemplateLog $bTemplateLog){
     public function getCustomTemplateLog(BTemplateLog $bTemplateLog){
         $this->request->validate([
         $this->request->validate([
-            'id'=>['required'],
+            'source_id'=>['required'],
         ],[
         ],[
-            'id.required' => 'ID不能为空',
+            'source_id.required' => 'ID不能为空',
         ]);
         ]);
         $this->map['source'] = 9;
         $this->map['source'] = 9;
+        $this->map['is_custom'] = 0;
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row);
         $lists = $bTemplateLog->lists($this->map,$this->page,$this->row);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

@@ -44,17 +44,14 @@ class APublicModel extends Base
                 ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
                 ->where('project_id', $project_id)->where('status', self::STATUS_ON)->count();
             //获取项目的询盘数量
             //获取项目的询盘数量
             $inquiryNumber = 0;
             $inquiryNumber = 0;
-//            $countInfo = DB::table('gl_count')->where('project_id', $project_id)->orderBy('id', 'desc')
-//                ->first();
-//            if(!empty($countInfo)){
-//                @file_put_contents(storage_path('logs/lyh_error.log'), var_export($countInfo, true) . PHP_EOL, FILE_APPEND);
-//                $inquiryNumber = $countInfo['inquiry_num'] ?? 0;
-//            }
+            $countInfo = DB::table('gl_count')->where('project_id', $project_id)->orderBy('id', 'desc')->first();
+            if(!empty($countInfo)){
+                $inquiryNumber = $countInfo->inquiry_num ?? 0;
+            }
             $data  = ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber,'key'=>$keyNumber,'inquiry'=>$inquiryNumber];
             $data  = ['product'=>$productNumber,'blog'=>$blogNumber,'news'=>$newsNumber,'key'=>$keyNumber,'inquiry'=>$inquiryNumber];
             Cache::add('product_blog_news_'.$project_id,$data,30 * 60);
             Cache::add('product_blog_news_'.$project_id,$data,30 * 60);
         }
         }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         return $data;
         return $data;
     }
     }
-
 }
 }