zq

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceLogController.java

@@ -91,11 +91,14 @@ public class PersonDeviceLogController {
 
             List<DeviceInfo> deviceInfoList = deviceInfoService.findByCompanyId(companyId);
             List<String> deviceIdList = new ArrayList<String>();
+
             for (DeviceInfo deviceInfo:deviceInfoList) {
                 deviceIdList.add(deviceInfo.getId());
             }
 
-            searchParams.put("deviceIdList",deviceIdList);
+            if (deviceIdList.size()>0) {
+                searchParams.put("deviceIdList", deviceIdList);
+            }
         }
         if(StringUtil.isNotEmpty(deviceNo)){
             searchParams.put("deviceNo","%"+deviceNo+"%");