|
@@ -107,16 +107,18 @@ public class PersonDeviceLogController {
|
|
|
|
|
|
String minTemperature = "";
|
|
String minTemperature = "";
|
|
String maxTemperature = "";
|
|
String maxTemperature = "";
|
|
- if(temperatureRangeArray.length==1){
|
|
|
|
- minTemperature = temperatureRangeArray[0];
|
|
|
|
- }
|
|
|
|
- else if(temperatureRangeArray.length==2){
|
|
|
|
|
|
+
|
|
|
|
+ if(temperatureRangeArray.length == 2){
|
|
minTemperature = temperatureRangeArray[0];
|
|
minTemperature = temperatureRangeArray[0];
|
|
maxTemperature = temperatureRangeArray[1];
|
|
maxTemperature = temperatureRangeArray[1];
|
|
}
|
|
}
|
|
|
|
|
|
- searchParams.put("minTemperature",minTemperature);
|
|
|
|
- searchParams.put("maxTemperature",maxTemperature);
|
|
|
|
|
|
+ if(StringUtil.isNotEmpty(minTemperature)){
|
|
|
|
+ searchParams.put("minTemperature",minTemperature);
|
|
|
|
+ }
|
|
|
|
+ if(StringUtil.isNotEmpty(maxTemperature)){
|
|
|
|
+ searchParams.put("maxTemperature",maxTemperature);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
Page<PersonDeviceLog> page = personDeviceLogService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
|
|
Page<PersonDeviceLog> page = personDeviceLogService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
|