|
@@ -222,7 +222,7 @@ public class AreaService {
|
|
|
if (splitAddress.getCommunity() == null) {
|
|
|
splitAddress.setCommunity("");
|
|
|
}
|
|
|
- String sql = "select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and city like '%" + splitAddress.getCity() + "%' " +
|
|
|
+ String sql = "select * from " + Constant.getSearchTableName() + " WHERE city like '%" + splitAddress.getCity() + "%' " +
|
|
|
"and county like '%" + splitAddress.getDistrict() + "%' and town like '%" + splitAddress.getStreet() + "%' " +
|
|
|
"and community like '%" + splitAddress.getCommunity() + "%' order by updatetime desc LIMIT 20";
|
|
|
try {
|
|
@@ -247,7 +247,7 @@ public class AreaService {
|
|
|
|
|
|
List<Address> list = null;
|
|
|
if (StringUtils.hasText(splitAddress.getDistrict())) {
|
|
|
- String sql = "select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and county like '%" + splitAddress.getDistrict() + "%' " +
|
|
|
+ String sql = "select * from " + Constant.getSearchTableName() + " WHERE county like '%" + splitAddress.getDistrict() + "%' " +
|
|
|
"and (sourceaddress like '%" + splitAddress.getSearchAddr() + "%' or address like '%" + splitAddress.getSearchAddr() + "%') order by updatetime desc LIMIT 20";
|
|
|
try {
|
|
|
list = odsToAddr(DbConnection.getInstance().runSqlStr(sql));
|
|
@@ -256,7 +256,7 @@ public class AreaService {
|
|
|
}
|
|
|
}
|
|
|
if (list == null) {
|
|
|
- String sql = "select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and (sourceaddress like '%" + splitAddress.getSearchAddr() + "%' or address like '%" + splitAddress.getSearchAddr() + "%') order by updatetime desc LIMIT 20";
|
|
|
+ String sql = "select * from " + Constant.getSearchTableName() + " WHERE sourceaddress like '%" + splitAddress.getSearchAddr() + "%' or address like '%" + splitAddress.getSearchAddr() + "%' order by updatetime desc LIMIT 20";
|
|
|
try {
|
|
|
list = odsToAddr(DbConnection.getInstance().runSqlStr(sql));
|
|
|
} catch (Exception e) {
|
|
@@ -275,7 +275,7 @@ public class AreaService {
|
|
|
*/
|
|
|
public List<Address> getAddressPoiOnlyDB(String addr) {
|
|
|
try {
|
|
|
- return odsToAddr(DbConnection.getInstance().runSqlStr("select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and sourceaddress LIKE '%" + addr + "%' or address LIKE '%" + addr + "%' order by updatetime desc LIMIT 20"));
|
|
|
+ return odsToAddr(DbConnection.getInstance().runSqlStr("select * from " + Constant.getSearchTableName() + " WHERE sourceaddress LIKE '%" + addr + "%' or address LIKE '%" + addr + "%' order by updatetime desc LIMIT 20"));
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|