From 3d40f2be78cef391607c441ecb342a65bf80c4e8 Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Wed, 19 Jul 2023 13:28:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=B0=8F=E5=8C=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E5=88=AB=E5=90=8D=E5=BF=BD=E7=95=A5=E6=97=A0?= =?UTF-8?q?=E6=95=88=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/DistrictController.java | 2 ++ .../src/main/webapp/district2/editOffice.ftl | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 63339af65..7879767cc 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -1215,6 +1215,7 @@ public class DistrictController { params.add(new QueryParam("city", city)); params.add(new QueryParam("region", region)); params.add(new QueryParam("alias", name)); + params.add(new QueryParam("visible", 0)); List ds = districtService.findAllByParams(params); if (CollectionUtils.isNotEmpty(ds)) { @@ -2350,6 +2351,7 @@ public class DistrictController { params = new ArrayList(2); params.add(new QueryParam("category", "district,new_district")); params.add(new QueryParam("name", a)); + params.add(new QueryParam("visible", 0)); ds = districtService.findAllByParams(params); diff --git a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl index 1e011a489..f6b0277f3 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl @@ -259,7 +259,19 @@ <#-- --> <#-- --> <#-- --> -<#-- --> + + + <#if markMap?? && markMap["township"]?? && markMap["township"] == 1> + + <#else> + + + 乡镇街道 + + + + + <#if markMap?? && markMap["loop_line_info"]?? && markMap["loop_line_info"] == 1> @@ -479,7 +491,7 @@ <#if markMap?? && markMap["estate_charge"]?? && markMap["estate_charge"] == 1> <#else> - + 物 业 费