diff --git a/service/app/admin/controller/AdminController.php b/service/app/admin/controller/AdminController.php
index 36e7c2f6..7706132e 100644
--- a/service/app/admin/controller/AdminController.php
+++ b/service/app/admin/controller/AdminController.php
@@ -220,7 +220,7 @@ class AdminController extends base
             // 判断在线时长，低于8小时不可下线
             $admin = Admins::where('id', $request->admin->id)->find();
             $workTime = time() - $admin->start_work_time;
-            if ($workTime < 60*60*8) {
+            if ($admin->is_super == 0 && $workTime < 60*60*8) {
                 return $this->error(1004,'未满8小时暂不能下线，请联系管理员');
             }
         }
diff --git a/service/app/admin/controller/OrderController.php b/service/app/admin/controller/OrderController.php
index 703238b1..a0f06e52 100644
--- a/service/app/admin/controller/OrderController.php
+++ b/service/app/admin/controller/OrderController.php
@@ -100,7 +100,9 @@ class OrderController extends base
         if($status!=null && $status >= 0) {
             $query->where('status', $status);
         }
-        $query->where('status', '!=', 4);
+        if ($status != 4) {
+            $query->where('status', '!=', 4);
+        }
 
         $appointment_status = $request->get('appointment_status', null);
         if($appointment_status!=null && $appointment_status >= 0) {