Merge remote-tracking branch 'remotes/origin/dev_grid_patrol' into dev

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())){
+                    if (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark())){
                         r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE));
                         r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE));
                     }
@@ -191,4 +191,4 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
     }
 
 
-}
+}