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

Master server



查看合并请求 !1207

@@ -64,7 +64,7 @@ class AiBlogController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['image'] = getImageUrl($v['image']);
                 $v['image'] = getImageUrl($v['image']);
-                $v['route'] = $this->user['domain'] . '/ai_blog/' . $v['route'];
+                $v['route'] = $this->user['domain'] . '/' . $v['route'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -101,6 +101,13 @@ class AiBlogController extends BaseController
     public function getAiBlogAuthor(AiBlogAuthor $aiBlogAuthor){
     public function getAiBlogAuthor(AiBlogAuthor $aiBlogAuthor){
         $field = ['id','route','author_id','title','image','created_at','updated_at'];
         $field = ['id','route','author_id','title','image','created_at','updated_at'];
         $lists = $aiBlogAuthor->lists($this->map,$this->page,$this->row,'id',$field);
         $lists = $aiBlogAuthor->lists($this->map,$this->page,$this->row,'id',$field);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['image'] = getImageUrl($v['image']);
+                $v['route'] = $this->user['domain'] . '/' . $v['route'];
+                $lists['list'][$k] = $v;
+            }
+        }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
@@ -162,6 +169,12 @@ class AiBlogController extends BaseController
      */
      */
     public function getAiBlogList(AiBlogList $aiBlogList){
     public function getAiBlogList(AiBlogList $aiBlogList){
         $lists = $aiBlogList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
         $lists = $aiBlogList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['route'] = $this->user['domain'] . '/ai_blogs/' . $v['route'];
+                $lists['list'][$k] = $v;
+            }
+        }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -248,7 +248,7 @@ class ProjectLogic extends BaseLogic
     public function createAuthor($project_id,$mch_id,$key){
     public function createAuthor($project_id,$mch_id,$key){
         //查看当前项目是否已经创建了作者
         //查看当前项目是否已经创建了作者
         $aiBlogTaskModel = new AiBlogTask();
         $aiBlogTaskModel = new AiBlogTask();
-        $count = $aiBlogTaskModel->count();
+        $count = $aiBlogTaskModel->counts(['project_id'=>$project_id]);
         if($count > 0){
         if($count > 0){
             return true;
             return true;
         }
         }