|
@@ -12,6 +12,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
|
|
@Slf4j
|
|
@Slf4j
|
|
|
@Service
|
|
@Service
|
|
@@ -31,10 +32,16 @@ public class StorageLogic {
|
|
|
public List<StorageBean> locateStorageList(String companyWechatId, String lng, String lat) {
|
|
public List<StorageBean> locateStorageList(String companyWechatId, String lng, String lat) {
|
|
|
if (StringUtils.isBlank(lng) || StringUtils.isBlank(lat)) {
|
|
if (StringUtils.isBlank(lng) || StringUtils.isBlank(lat)) {
|
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
|
- final String locate = currentCompanyWechat.getUser().getCurLocate();
|
|
|
|
|
- final String[] locates = locate.split(",");
|
|
|
|
|
- lng = locates[0];
|
|
|
|
|
- lat = locates[1];
|
|
|
|
|
|
|
+ if (Objects.nonNull(currentCompanyWechat.getUser())) {
|
|
|
|
|
+ final String locate = currentCompanyWechat.getUser().getCurLocate();
|
|
|
|
|
+ final String[] locates = locate.split(",");
|
|
|
|
|
+ lng = locates[0];
|
|
|
|
|
+ lat = locates[1];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ lng = "0";
|
|
|
|
|
+ lat = "0";
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
List<StorageBean> storageList = appMapper.findStorageByLocate(companyWechatId, lng, lat);
|
|
List<StorageBean> storageList = appMapper.findStorageByLocate(companyWechatId, lng, lat);
|
|
|
return storageList;
|
|
return storageList;
|