diff --git a/service/app/admin/controller/AdminController.php b/service/app/admin/controller/AdminController.php
index 7a270456..36e7c2f6 100644
--- a/service/app/admin/controller/AdminController.php
+++ b/service/app/admin/controller/AdminController.php
@@ -216,6 +216,13 @@ class AdminController extends base
         $post['end_work_time'] = time();
         if ($post['is_order'] == 1){
             $post['end_work_time'] = 0;
+        } else {
+            // 判断在线时长，低于8小时不可下线
+            $admin = Admins::where('id', $request->admin->id)->find();
+            $workTime = time() - $admin->start_work_time;
+            if ($workTime < 60*60*8) {
+                return $this->error(1004,'未满8小时暂不能下线，请联系管理员');
+            }
         }
 
         try {
diff --git a/service/app/admin/controller/LoginController.php b/service/app/admin/controller/LoginController.php
index b325096a..89931457 100644
--- a/service/app/admin/controller/LoginController.php
+++ b/service/app/admin/controller/LoginController.php
@@ -64,12 +64,6 @@ class LoginController extends base
     }
 
     public function Logout(Request $request) {
-        // 判断在线时长，低于8小时不可下线
-        $admin = Admins::where('id', $request->admin->id)->find();
-        $workTime = time() - $admin->start_work_time;
-        if ($admin->is_order == 1 && $workTime < 60*60*8) {
-            return $this->error(1004,'未满8小时暂不能下线，请联系管理员');
-        }
         $md5 = md5($request->token);
         Redis::set('Admin:logout:'.$md5, time() , 'EX', 3600*24);
         setcookie('Admin-Token', '', time() - 3600);