From a66a3c0e8e51b146af61c3db2e1b81c9ea6173e4 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 3 Apr 2018 15:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=9F=9F=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D=E5=8C=BA=E5=9F=9Fbug,=E7=94=B1=E4=BA=8E=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=8F=AA=E6=9F=A5=E8=AF=A2=E4=BA=86=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=8C=B9=E9=85=8D=E5=8C=BA=E5=9F=9F=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=BA=86=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/configuration/MultipleCfgController.java   | 8 ++++----
 .../webapp/WEB-INF/include/form/multiple/complexInfo.jsp  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
index 3fc45f3f4..7bc24621f 100644
--- a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
@@ -436,8 +436,8 @@ public class MultipleCfgController extends BaseController{
 					Map<String,ComplexkeywordCfg> map=cfg.getComplexCfg();
 					map.put(tableName,complexCfg);
 				}
-				List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
-				model.addAttribute("districts", districts);
+//				List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
+//				model.addAttribute("districts", districts);
 			}
 		}
 			cfg.setAction(action);
@@ -573,8 +573,8 @@ public class MultipleCfgController extends BaseController{
 						this.setPropertiesToMultipleCfg(resultCfg, resultComplexCfg,"update");
 					}
 				}
-				List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
-				model.addAttribute("districts", districts);
+//				List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
+//				model.addAttribute("districts", districts);
 			}
 		}
 			model.addAttribute("_cfg", resultCfg);
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
index c9e6beff6..1184815be 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
@@ -38,7 +38,7 @@ $(function(){
             		<c:when test="${mainTableType eq '4' and otherTable==null}">
            				<select name="complexCfg[${mainTable}].district" class="district selectpicker select2 form-control">
            					<option value=""><spring:message code='select'/></option>
-           					<c:forEach items="${districts}" var="district">
+           					<c:forEach items="${fns:getFeaturesDictData(mainTable)}" var="district">
            						<option value="${district.itemValue}"
            						<c:if test="${_cfg.complexCfg[mainTable].district eq district.itemValue}">selected</c:if>
            						>${district.itemValue}</option>
@@ -48,7 +48,7 @@ $(function(){
             		<c:when test="${otherTable!=null  and otherTable.tableType eq '4'}">
             			<select name="complexCfg[${otherTable.tableName}].district" class="district selectpicker select2 form-control">
            					<option value=""><spring:message code='select'/></option>
-           					<c:forEach items="${districts}" var="district">
+           					<c:forEach items="${fns:getFeaturesDictData(otherTable.tableName)}" var="district">
            						<option value="${district.itemValue}"
            						<c:if test="${_cfg.complexCfg[otherTable.tableName].district eq district.itemValue}">selected</c:if>
            						>${district.itemValue}</option>