21312

DataVAPI/Controllers/AlarmController.cs

@@ -153,7 +153,7 @@ namespace DataVAPI.Controllers
                         stoptime = Tools.ConvertLongToDateTime(long.Parse(StopTime));
                         return JsonMsg<List<AlarmTable>>.OK(mg.QueryAllTime(device.ClientId, device.DeviceId, starttime, stoptime), st);
                     }
-                    else return JsonMsg<List<AlarmTable>>.OK(mg.QueryDeviceId(device.ClientId,device.DeviceId), st);
+                    else return JsonMsg<List<AlarmTable>>.OK(mg.QueryClientId(device.ClientId), st);
                 }
                 return JsonMsg<List<AlarmTable>>.OK(null, st);
             }