|
@@ -61,6 +61,12 @@ public class TopologicalStoreWdServiceImpl implements TopologicalStoreWdService
|
|
|
|
|
|
//1.根据经纬度 找到 周边网点Id 及 距离
|
|
|
getAroundWdIdList(topologicalWdAceeptVo,aroundWdId,wdDistMap);
|
|
|
+
|
|
|
+ //按应标要求去除本身
|
|
|
+ if (topologicalWdAceeptVo.getWdId() != null && !topologicalWdAceeptVo.getWdId().equals("")){
|
|
|
+ aroundWdId.remove(topologicalWdAceeptVo.getWdId());
|
|
|
+ }
|
|
|
+
|
|
|
if (aroundWdId.isEmpty()){
|
|
|
//没有周边网点
|
|
|
HashMap<String,Object> result = new HashMap();
|
|
@@ -70,11 +76,6 @@ public class TopologicalStoreWdServiceImpl implements TopologicalStoreWdService
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- //按应标要求去除本身
|
|
|
- if (topologicalWdAceeptVo.getWdId() != null && !topologicalWdAceeptVo.getWdId().equals("")){
|
|
|
- aroundWdId.remove(topologicalWdAceeptVo.getWdId());
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
//2.分页查找网点信息
|
|
|
QueryWrapper<WdInfo> queryWrapper = new QueryWrapper<>();
|