diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java index 1acaf678ce..94050b403e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java @@ -124,7 +124,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { result.forEach(r -> { if (!r.getLlStatus()){ finalGrids.forEach(g -> { - if (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark())){ + if (r.getGridId().equals(g.getGridId()) && (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark()))){ r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE)); r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE)); }