diff --git a/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php b/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php
index cef4d96f..f55310f6 100644
--- a/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php
+++ b/Server/application/cunkebao/controller/device/GetDeviceListV1Controller.php
@@ -167,10 +167,9 @@ class GetDeviceListV1Controller extends BaseController
             if ($this->getUserInfo('isAdmin') == UserModel::ADMIN_STP) {
                 $where = $this->makeWhere();
                 $result = $this->getDeviceList($where);
-            }
-
-            else {
-                $where = $this->makeWhere( $this->makeDeviceIdsWhere() );
+            }else {
+                //$where = $this->makeWhere( $this->makeDeviceIdsWhere() );
+                $where = $this->makeWhere();
                 $result = $this->getDeviceList($where);
             }