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

gx添加随机模块



查看合并请求 !2062

@@ -29,7 +29,8 @@ class AiCommandController extends BaseController
             $this->map['name|key|ai'] = ['like','%'.$this->map['scene'].'%'];
             $this->map['name|key|ai'] = ['like','%'.$this->map['scene'].'%'];
             unset($this->map['scene']);
             unset($this->map['scene']);
         }
         }
-        $lists = $aiCommandModel->lists($this->map,$this->page,$this->row,$this->order);
+        $this->order = 'project_id';
+        $lists = $aiCommandModel->lists($this->map,$this->page,$this->row,$this->order,['*'],'asc');
         $projectModel = new Project();
         $projectModel = new Project();
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){