Merge branch 'master' of e.coding.net:zdap/weixiu/weixiu_api into zaxiang_m

app/adminapi/service/AdminTokenService.php

@@ -104,7 +104,7 @@ class AdminTokenService
             ->where('a.admin_id', $adminId)
             ->value('b.name');
 
-        if (strpos($roolName, '客服') !== false || strpos($roolName, '派单') !== false) {
+        if (!empty($roolName) && (strpos($roolName, '客服') !== false || strpos($roolName, '派单') !== false)) {
             return Config::get('project.kefu_admin_token.expire_duration');
         } else {
             return Config::get('project.admin_token.expire_duration');

app/common/command/AutomaticDispatch.php

@@ -73,7 +73,7 @@ class AutomaticDispatch extends Command
 
         $list = ServiceWork::alias("a")
             ->leftJoin('service_work_anomalous b','a.id = b.work_id')
-            ->where('a.work_status','<',3)
+            ->where('a.work_status','<=',3)
             ->where('a.service_status','<',2)
             ->where('a.refund_approval',0)
             ->where('a.work_pay_status',1)