'优化建筑设备-分页接口'

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildFacilityServiceImpl.java

@@ -119,23 +119,19 @@ public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildF
                 list1.get(i).setTypeName(typeOne.getTypeName());
             }
         }
+
+
         if(StringUtils.isNotBlank(requestVO.getBuildName())){
-            list = list1.stream().filter(m-> m.getBuildName().contains(requestVO.getBuildName())).collect(Collectors.toList());
-        }else{
-            if(list1.size() > 0){
-                for(int j=0;j<list1.size();j++){
-                    list.add(list1.get(j));
-                }
-            }
+            list1 = list1.stream().filter(m-> m.getBuildName().contains(requestVO.getBuildName())).collect(Collectors.toList());
         }
 
         if(requestVO.getBuildId() != null){
-            list = list1.stream().filter(m-> m.getBuildId().equals(requestVO.getBuildId())).collect(Collectors.toList());
-        }else{
-            if(list1.size() > 0){
-                for(int j=0;j<list1.size();j++){
-                    list.add(list1.get(j));
-                }
+            list1 = list1.stream().filter(m-> m.getBuildId().equals(requestVO.getBuildId())).collect(Collectors.toList());
+        }
+
+        if(list1.size() > 0){
+            for(int j=0;j<list1.size();j++){
+                list.add(list1.get(j));
             }
         }
 

service-park/service-park-biz/src/main/java/com/usky/park/service/impl/DmpDeviceServiceImpl.java

@@ -137,22 +137,20 @@ public class DmpDeviceServiceImpl extends AbstractCrudService<DmpDeviceMapper, D
             }
 
             if(StringUtils.isNotBlank(deviceStatus)){
-                list = list3.stream().filter(e -> deviceStatus.equals(e.getDeviceStatus())).collect(Collectors.toList());
+                list3 = list3.stream().filter(e -> deviceStatus.equals(e.getDeviceStatus())).collect(Collectors.toList());
             }
 
             if(StringUtils.isNotBlank(doorStatus)){
-                list = list3.stream().filter(e -> doorStatus.equals(e.getDoorStatus())).collect(Collectors.toList());
+                list3 = list3.stream().filter(e -> doorStatus.equals(e.getDoorStatus())).collect(Collectors.toList());
             }
 
             if(StringUtils.isNotBlank(switchStatus)){
-                list = list3.stream().filter(e -> switchStatus.equals(e.getSwitchStatus())).collect(Collectors.toList());
+                list3 = list3.stream().filter(e -> switchStatus.equals(e.getSwitchStatus())).collect(Collectors.toList());
             }
 
-            if((StringUtils.isBlank(deviceStatus))&&(StringUtils.isBlank(doorStatus))&&(StringUtils.isBlank(switchStatus))){
-                if(list3.size()>0){
-                    for(int i=0;i<list3.size();i++){
-                        list.add(list3.get(i));
-                    }
+            if(list3.size()>0){
+                for(int i=0;i<list3.size();i++){
+                    list.add(list3.get(i));
                 }
             }