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

gx



查看合并请求 !1554

@@ -89,8 +89,6 @@ 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

@@ -10,6 +10,7 @@ use App\Models\Project\AiBlogTask;
 use App\Models\Project\ProjectAiSetting;
 use App\Models\Project\ProjectAiSetting;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Services\AiBlogService;
 use App\Services\AiBlogService;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 
 
 class AiBlogLogic extends BaseLogic
 class AiBlogLogic extends BaseLogic
@@ -138,12 +139,10 @@ class AiBlogLogic extends BaseLogic
                 RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
                 RouteMap::delRoute(RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
                 $this->model->del(['id'=>$id]);
                 $this->model->del(['id'=>$id]);
             }
             }
-            shell_exec('php artisan save_ai_blog_list '.$this->user['project_id'].' > /dev/null 2>&1 &');
+            Artisan::call('save_ai_blog_list', ['project_id' => $this->user['project_id']]);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('删除失败');
             $this->fail('删除失败');
         }
         }
         return $this->success();
         return $this->success();
     }
     }
-
-
 }
 }