diff --git a/projects/fangjia-bkoff/src/main/webapp/township/list.ftl b/projects/fangjia-bkoff/src/main/webapp/township/list.ftl index 705b3ea2e..0a3653ae4 100644 --- a/projects/fangjia-bkoff/src/main/webapp/township/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/township/list.ftl @@ -26,6 +26,7 @@ value="${district!}"> @@ -38,6 +39,7 @@ 城市 区域 乡镇 + 乡镇别å�� 修改日期 æ“�作人 @@ -47,6 +49,12 @@ ${it.city1!} ${it.district!} ${it.street!} + <#if it.alias??> + <#list it.alias as item> + ${item?string}<#if item_has_next>, + + + ${it.updateTime!?string("yyyy-MM-dd HH:mm:ss")} ${it.operator!} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java index 90623eb32..9cb6373d6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/TownshipServiceImpl.java @@ -4,6 +4,8 @@ import com.fangjia.dal.QueryParam; import com.fangjia.dal.mongo.dao.AdministrativeMappingDao; import com.fangjia.dal.mongo.dao.TownshipDao; import com.fangjia.dal.mongo.model.Township; +import com.mongodb.BasicDBList; +import com.mongodb.BasicDBObject; import org.apache.commons.lang.StringUtils; import org.sothis.core.util.Pager; @@ -42,7 +44,10 @@ public class TownshipServiceImpl implements TownshipService { } if (StringUtils.isNotBlank(street)) { Pattern pattern = Pattern.compile(".*" + street + ".*"); - params.add(new QueryParam("street", pattern)); + BasicDBList orList = new BasicDBList(); + orList.add(new BasicDBObject("alias", pattern)); + orList.add(new BasicDBObject("street", pattern)); + params.add(new QueryParam("$or",orList)); } params.add(new QueryParam("type","ÏçÕò½ÖµÀ")); @@ -67,7 +72,11 @@ public class TownshipServiceImpl implements TownshipService { } if (StringUtils.isNotBlank(street)) { Pattern pattern = Pattern.compile(".*" + street + ".*"); - params.add(new QueryParam("street", pattern)); + //mongo or²éѯ·½·¨ + BasicDBList orList = new BasicDBList(); + orList.add(new BasicDBObject("alias", pattern)); + orList.add(new BasicDBObject("street", pattern)); + params.add(new QueryParam("$or",orList)); } params.add(new QueryParam("type","ÏçÕò½ÖµÀ")); return townshipDao.findCountByParams(params);