gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复多域匹配区域bug,由于后台只查询了主表的匹配区域导致了展示错误

Browse Source
This commit is contained in:
wangxin
2018-04-03 15:46:51 +08:00
parent 33b7df09c9
commit a66a3c0e8e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
View File

@@ -436,8 +436,8 @@ public class MultipleCfgController extends BaseController{
Map<String,ComplexkeywordCfg> map=cfg.getComplexCfg(); Map<String,ComplexkeywordCfg> map=cfg.getComplexCfg();
map.put(tableName,complexCfg); map.put(tableName,complexCfg);
} }
List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName); // List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
model.addAttribute("districts", districts); // model.addAttribute("districts", districts);
} }
} }
cfg.setAction(action); cfg.setAction(action);
@@ -573,8 +573,8 @@ public class MultipleCfgController extends BaseController{
this.setPropertiesToMultipleCfg(resultCfg, resultComplexCfg,"update"); this.setPropertiesToMultipleCfg(resultCfg, resultComplexCfg,"update");
} }
} }
List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName); // List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
model.addAttribute("districts", districts); // model.addAttribute("districts", districts);
} }
} }
model.addAttribute("_cfg", resultCfg); model.addAttribute("_cfg", resultCfg);

4
src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
View File

@@ -38,7 +38,7 @@ $(function(){
<c:when test="${mainTableType eq '4' and otherTable==null}"> <c:when test="${mainTableType eq '4' and otherTable==null}">
<select name="complexCfg[${mainTable}].district" class="district selectpicker select2 form-control"> <select name="complexCfg[${mainTable}].district" class="district selectpicker select2 form-control">
<option value=""><spring:message code='select'/></option> <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}" <option value="${district.itemValue}"
<c:if test="${_cfg.complexCfg[mainTable].district eq district.itemValue}">selected</c:if> <c:if test="${_cfg.complexCfg[mainTable].district eq district.itemValue}">selected</c:if>
>${district.itemValue}</option> >${district.itemValue}</option>
@@ -48,7 +48,7 @@ $(function(){
<c:when test="${otherTable!=null and otherTable.tableType eq '4'}"> <c:when test="${otherTable!=null and otherTable.tableType eq '4'}">
<select name="complexCfg[${otherTable.tableName}].district" class="district selectpicker select2 form-control"> <select name="complexCfg[${otherTable.tableName}].district" class="district selectpicker select2 form-control">
<option value=""><spring:message code='select'/></option> <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}" <option value="${district.itemValue}"
<c:if test="${_cfg.complexCfg[otherTable.tableName].district eq district.itemValue}">selected</c:if> <c:if test="${_cfg.complexCfg[otherTable.tableName].district eq district.itemValue}">selected</c:if>
>${district.itemValue}</option> >${district.itemValue}</option>