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

Lyh server



查看合并请求 !2708

@@ -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);
             }
             }

@@ -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');