Merge remote-tracking branch 'origin/master' into akun

@@ -131,7 +131,6 @@ class TicketCount extends Command
             if(!empty($timeout_num)){
             if(!empty($timeout_num)){
                 $timeout_ratio = round($timeout_num / $ticket_num, 3);
                 $timeout_ratio = round($timeout_num / $ticket_num, 3);
             }
             }
-            $date = date('Y-m-d');
             if(!empty($complete_num)){
             if(!empty($complete_num)){
                 $complete_ratio = round($complete_num / $ticket_num, 2);
                 $complete_ratio = round($complete_num / $ticket_num, 2);
             }
             }

@@ -77,6 +77,9 @@ class UpdateKeyword extends Command
         if($updateObject['type'] == 0){//更新所有关键字
         if($updateObject['type'] == 0){//更新所有关键字
             //获取所有关键字的id
             //获取所有关键字的id
             $idArr = $keywordModel->selectField(['id'=>['>',0]],'id');
             $idArr = $keywordModel->selectField(['id'=>['>',0]],'id');
+            if(empty($idArr)){
+                return true;
+            }
             if($info['update_method'] != 1){
             if($info['update_method'] != 1){
                 $idArr = shuffle($idArr);
                 $idArr = shuffle($idArr);
             }
             }

@@ -27,7 +27,7 @@ class ATemplateController extends BaseController
     public function lists(ATemplateLogic $aTemplateLogic){
     public function lists(ATemplateLogic $aTemplateLogic){
         $templateLabel = new TemplateLabel();
         $templateLabel = new TemplateLabel();
         $this->map = $this->searchLabelName($templateLabel);
         $this->map = $this->searchLabelName($templateLabel);
-        $filed = ['id','name','image','url','status','upload_id','sort','deleted_status','test_model','created_at','project_id'];
+        $filed = ['id','name','image','url','status','upload_id','sort','deleted_status','test_model','submit_time','front_status','design_status','created_at','project_id'];
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         $lists = $aTemplateLogic->aTemplateList($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             $manageModel = new Manage();
             $manageModel = new Manage();

@@ -127,11 +127,11 @@ class AsideTicketController extends BaseController
             }
             }
         }
         }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
-            return $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
+            $query->whereBetween('created_at',[$this->param['start_at'],$this->param['end_at']]);
         }
         }
         //搜索提交人姓名
         //搜索提交人姓名
         if(!empty($this->param['submit_username'])){
         if(!empty($this->param['submit_username'])){
-            return $query->where('submit_username','like','%'.$this->param['submit_username'].'%');
+            $query->where('submit_username','like','%'.$this->param['submit_username'].'%');
         }
         }
         // 添加排序功能
         // 添加排序功能
         $query->orderBy('status', 'asc');
         $query->orderBy('status', 'asc');