合并分支 'master-lyh-edit' 到 'master'

产品关键字 +分类，robots设置



查看合并请求 !601

@@ -331,6 +331,9 @@ class OptimizeController extends BaseController
             'project_id.required' => 'project_id不能为空',
             'project_id.required' => 'project_id不能为空',
         ]);
         ]);
         $projectModel = new Project();
         $projectModel = new Project();
+        if($this->param['robots'] != $projectModel::STATUS_ONE){
+            $this->response('robots只能开启不能关闭',Code::SYSTEM_ERROR);
+        }
         $rs = $projectModel->edit(['robots'=>$this->param['robots']],['id'=>$this->param['project_id']]);
         $rs = $projectModel->edit(['robots'=>$this->param['robots']],['id'=>$this->param['project_id']]);
         if($rs === false){
         if($rs === false){
             $this->response('执行错误，请联系开发人员',Code::SYSTEM_ERROR);
             $this->response('执行错误，请联系开发人员',Code::SYSTEM_ERROR);

@@ -60,7 +60,7 @@ class ProductController extends BaseController
             $userModel = new User();
             $userModel = new User();
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
                 $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);;
                 $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);;
-                $v['category_id_text'] = $this->categoryName($v['category_id'],$cate_data);
+                $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
                 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
                 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
                 $v['created_uid_text'] = $userModel->getName($v['created_uid']);
                 $v['created_uid_text'] = $userModel->getName($v['created_uid']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
@@ -244,7 +244,9 @@ class ProductController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/9/14 13:58
      * @time   :2023/9/14 13:58
      */
      */
-    public function categoryName($category_id,$data){
+    public function categoryName($product_id,$data){
+        $cateRelatedModel = new CategoryRelated();
+        $category_id = $cateRelatedModel->where('product_id',$product_id)->pluck('cate_id')->toArray();
         $category_name = '';
         $category_name = '';
         if(!empty($category_id) && !empty($data)){
         if(!empty($category_id) && !empty($data)){
             foreach ($category_id as $v){
             foreach ($category_id as $v){