|
|
@@ -198,11 +198,11 @@ public class LandService extends BaseService<Land,Long> {
|
|
|
Map<Integer,String> namesMap = null;
|
|
|
String appendWhere = "";
|
|
|
String groupField = "";
|
|
|
- if(districtCode != null){
|
|
|
+ if(StringUtils.isNotBlank(districtCode)){
|
|
|
namesMap = townService.getNames(districtCode);
|
|
|
appendWhere += " and district_code = '" +districtCode+"'";
|
|
|
groupField += "town_id";
|
|
|
- }else if(city != null){
|
|
|
+ }else if(StringUtils.isNotBlank(city)){
|
|
|
namesMap = districtService.getNames(city);
|
|
|
appendWhere += " and district_code like '" + city.substring(0,4) + "%'";
|
|
|
groupField += "district_code";
|
