Преглед на файлове

台账日志 增加参数,温度范围查询

yanliming преди 5 години
родител
ревизия
2fea89acb6
променени са 1 файла, в които са добавени 8 реда и са изтрити 6 реда
  1. 8 6
      web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceLogController.java

+ 8 - 6
web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonDeviceLogController.java

@@ -107,16 +107,18 @@ public class PersonDeviceLogController {
 
             String minTemperature = "";
             String maxTemperature = "";
-            if(temperatureRangeArray.length==1){
-                minTemperature = temperatureRangeArray[0];
-            }
-            else if(temperatureRangeArray.length==2){
+
+            if(temperatureRangeArray.length == 2){
                 minTemperature = temperatureRangeArray[0];
                 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);