Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java

@@ -1126,6 +1126,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                             }
                         }
                     });
+                }
                 if (CollectionUtils.isNotEmpty(entities)){
                     entities.forEach(e -> resiInfos.stream().filter(r ->r.getIdCard().equals(e.getIdCard())).forEach(r -> {
                         e.setGridId(r.getGridId());
@@ -1146,7 +1147,6 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                         updateTripReportList(n);
                     });
                 }
-                }
             });
         }else {
             log.warn("未拉取到行程上报信息！");