From 52b31d09cd0270e2b488b82da39ebdf4ade3d3f3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 16:48:55 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index b079a01..2db032d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -167,9 +167,10 @@
apiLeaderInfoVo.setDetailAddress(mallTeamLeader.getDetailAddress());
apiLeaderInfoVo.setAddressArea(mallTeamLeader.getAddressArea());
MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
- String longLatStr = mallElectronicFence.getLonglatiarr();
- List<String> longLatArr = StrUtil.splitTrim(longLatStr, ";");
- apiLeaderInfoVo.setLonglatiarr(longLatArr);
+ if(ObjectUtil.isNotEmpty(mallElectronicFence)){
+ String longLatStr = mallElectronicFence.getLonglatiarr();
+ apiLeaderInfoVo.setLonglatiarr(longLatStr);
+ }
return new FebsResponse().success().data(apiLeaderInfoVo);
}
@@ -293,6 +294,12 @@
apiLeaderInfoVo.setTownship(mallTeamLeader.getTownship());
apiLeaderInfoVo.setDetailAddress(mallTeamLeader.getDetailAddress());
apiLeaderInfoVo.setAddressArea(mallTeamLeader.getAddressArea());
+ MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
+ if(ObjectUtil.isNotEmpty(mallElectronicFence)){
+ apiLeaderInfoVo.setLonglatiarr(mallElectronicFence.getLonglatiarr());
+ }
+ apiLeaderInfoVo.setLongitude(mallTeamLeader.getLongitude());
+ apiLeaderInfoVo.setLatitude(mallTeamLeader.getLatitude());
}
if(ObjectUtil.isEmpty(apiLeaderInfoVo)){
return new FebsResponse().success();
--
Gitblit v1.9.1