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

Lyh server



查看合并请求 !1524

@@ -140,7 +140,7 @@ class ComController extends BaseController
             if($is_comment != 1){
             if($is_comment != 1){
                 $info['role_menu'] = trim(str_replace(',55,',',',','.$info['role_menu'].','),',');
                 $info['role_menu'] = trim(str_replace(',55,',',',','.$info['role_menu'].','),',');
             }
             }
-            $is_blogs = $this->getIsBlog();
+            $is_blogs = $this->getIsAiBlog();
             if($is_blogs != 1){
             if($is_blogs != 1){
                 $info['role_menu'] = trim(str_replace(',57,',',',','.$info['role_menu'].','),',');
                 $info['role_menu'] = trim(str_replace(',57,',',',','.$info['role_menu'].','),',');
             }
             }

@@ -89,6 +89,8 @@ class CategoryController extends BaseController
     public function get3283Lists($filed){
     public function get3283Lists($filed){
         if(!isset($this->map['title'])){
         if(!isset($this->map['title'])){
             $this->map['pid'] = $this->map['pid'] ?? 0;
             $this->map['pid'] = $this->map['pid'] ?? 0;
+        }else{
+            $this->map['title'] = ['like','%'.$this->map['title'].'%'];
         }
         }
         $list = $this->model->list($this->map,['sort','id'],$filed);
         $list = $this->model->list($this->map,['sort','id'],$filed);
         $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST);//获取模版id
         $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST);//获取模版id