赋值查询值错误修复，设备修改绑定分区ID同步

scyz-gis/src/main/java/com/tofly/xrtygis/controller/TfDeviceArchiveManageController.java

@@ -120,7 +120,7 @@ public class TfDeviceArchiveManageController {
                 Dmatable dmatable = new Dmatable();
                 dmatable.setDeviceId(tfDeviceArchiveManage.getId());
                 dmatable.setMinFlow((double)0);
-
+                dmatable.setId(tfDeviceArchiveManage.getId());
                 dmatableService.save(dmatable);
             }
             return ResultRespone.success(save);
@@ -151,6 +151,7 @@ public class TfDeviceArchiveManageController {
         if("0".equals(deviceType)){
             Dmatable dmatable = new Dmatable();
             dmatable.setDeviceId(tfDeviceArchiveManage.getId());
+            dmatable.setId(tfDeviceArchiveManage.getId());
             dmatable.setMinFlow((double)0);
             if(null==one){
                 dmatableService.save(dmatable);

scyz-scada/src/main/java/com/tofly/scada/service/impl/StatisticsScadaServiceImpl.java

@@ -148,7 +148,11 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
                         scadaQuery.getSameEnd()), page, queryWrapper1, isPage);
                 // 填充
                 Page<StatisticsScadaVo> pageDb = new Page();
-                scadaVoPage1.getRecords().addAll(records);
+                if (!CollectionUtils.isEmpty(scadaVoPage1.getRecords())){
+                    scadaVoPage1.getRecords().addAll(records);
+                }else {
+                    scadaVoPage1.setRecords(records);
+                }
                 pageDb.setRecords(scadaVoPage1.getRecords());
                 pageDb.setSize(scadaVoPage1.getRecords().size());
                 pageDb.setTotal(scadaVoPage.getTotal()+scadaVoPage1.getTotal());