Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java

@@ -68,16 +68,16 @@ public class PipeInterfaceController {
         DeviceList deviceList=new DeviceList();
         //调压箱数据循环
         for (int i=0;i<deviceData.size();i++){
+            //临时存下级数据id
+            List<PressureFlow> pressList=new ArrayList<>();
             for (int s=0;s<pressureFlows1.size();s++){
                 //判断调压箱id与下级数据调压箱id是否相等
                 if (pressureFlows1.get(s).getDeviceId()==deviceData.get(i).getDeviceId()){
-                    //临时存下级数据id
-                    List<PressureFlow> pressList=new ArrayList<>();
                     //下级数据添加进临时存储数据的数组中
                     pressList.add(pressureFlows1.get(s));
-                    deviceData.get(i).setPressureFlows(pressList);
                 }
             }
+            deviceData.get(i).setPressureFlows(pressList);
             deviceData.get(i).setIconType(2);
         }
         deviceList.setData(deviceData);