|
@@ -190,6 +190,7 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
|
|
|
LambdaQueryWrapper<SysGeographyPosition> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysGeographyPosition> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(StringUtils.isNotEmpty(addressInfoDto.getLng()), SysGeographyPosition::getLongitude, addressInfoDto.getLng());
|
|
wrapper.eq(StringUtils.isNotEmpty(addressInfoDto.getLng()), SysGeographyPosition::getLongitude, addressInfoDto.getLng());
|
|
|
wrapper.eq(StringUtils.isNotEmpty(addressInfoDto.getLat()), SysGeographyPosition::getLatitude, addressInfoDto.getLat());
|
|
wrapper.eq(StringUtils.isNotEmpty(addressInfoDto.getLat()), SysGeographyPosition::getLatitude, addressInfoDto.getLat());
|
|
|
|
|
+ wrapper.in(SysGeographyPosition::getSource, Arrays.asList("1","2"));
|
|
|
wrapper.orderByDesc(SysGeographyPosition::getCreateTime);
|
|
wrapper.orderByDesc(SysGeographyPosition::getCreateTime);
|
|
|
|
|
|
|
|
Page<SysGeographyPosition> insOrdersPage = page(page, wrapper);
|
|
Page<SysGeographyPosition> insOrdersPage = page(page, wrapper);
|
|
@@ -207,8 +208,6 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
return new BasePageResult<>(addressInfoDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
|
|
return new BasePageResult<>(addressInfoDto.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
|
|
|
sysGeographyPositionList);
|
|
sysGeographyPositionList);
|
|
|
}
|
|
}
|