|
@@ -1,7 +1,6 @@
|
|
|
package com.usky.fire.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
@@ -290,12 +289,17 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
|
|
|
}
|
|
|
}
|
|
|
if (map.get("longitude") != null && map.get("latitude") != null) {
|
|
|
- if (StringUtils.isNotBlank(streetTown)) {
|
|
|
- if (streetTown.equals(map.get("streetTown").toString())) {
|
|
|
+ Double longitude1 = Double.parseDouble(map.get("longitude").toString());
|
|
|
+ Double latitude1 = Double.parseDouble(map.get("latitude").toString());
|
|
|
+ if (121.236121 < longitude1 && 121.573493 > longitude1 &&
|
|
|
+ 30.97747 < latitude1 && 31.259224 > latitude1) {
|
|
|
+ if (StringUtils.isNotBlank(streetTown)) {
|
|
|
+ if (streetTown.equals(map.get("streetTown").toString())) {
|
|
|
+ list.add(map);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
list.add(map);
|
|
|
}
|
|
|
- } else {
|
|
|
- list.add(map);
|
|
|
}
|
|
|
}
|
|
|
}
|