From 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 26 Aug 2023 13:40:30 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
index 05f992c..c2ad449 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/ServicesScopeServiceImpl.java
@@ -209,6 +209,7 @@
                         Device device = devicesMap.get(key);
                         double getmeter1 = LongitudeAndLatitudeUtils.getmeter(point_lon, point_lat, device.getLongitude(), device.getLatitude());
                         if (getmeter1<getmeter){
+                            getmeter=getmeter1;
                             near_mac = device.getMac();
                         }
                     }

--
Gitblit v1.8.0