From dad7b11bbed06caa538342d38fc7d20abec6cd05 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Wed, 4 Jul 2018 17:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E7=B1=BB=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8C=B9=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E7=BC=BA=E7=9C=81=E4=B8=BA=E5=AD=90=E4=B8=B2=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index a9beb3e6e..45d899c0f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -84,7 +84,7 @@
 				<select name="${cfgName}.matchMethod"
 					class="selectpicker select2 form-control required">
 					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-						<option value="${matchMethodC.itemCode}" <c:if test="${complexCfg.matchMethod==matchMethodC.itemCode || (complexCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+						<option value="${matchMethodC.itemCode}" <c:if test="${complexCfg.matchMethod==matchMethodC.itemCode || (complexCfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
 					</c:forEach> 
 				</select>
 			</div>
@@ -101,7 +101,7 @@
 				<select name="${cfgName}.isHexbin"
 					class="selectpicker select2 form-control required">
 					<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-						<option value="${isHexbinC.itemCode}" <c:if test="${complexCfg.isHexbin==isHexbinC.itemCode || (complexCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+						<option value="${isHexbinC.itemCode}" <c:if test="${complexCfg.isHexbin==isHexbinC.itemCode || (complexCfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
 					</c:forEach>
 				</select>
 			</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index e0cf27e92..c2980bef4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -68,7 +68,7 @@ $(function(){
 				<select name="${cfgName}.matchMethod"
 					class="selectpicker select2 form-control required">
 					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-						<option value="${matchMethodC.itemCode}" <c:if test="${strCfg.matchMethod==matchMethodC.itemCode || (strCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+						<option value="${matchMethodC.itemCode}" <c:if test="${strCfg.matchMethod==matchMethodC.itemCode || (strCfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
 					</c:forEach>
 				</select>
 			</div>
@@ -85,7 +85,7 @@ $(function(){
 				<select name="${cfgName}.isHexbin"
 					class="selectpicker select2 form-control required">
 					<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-						<option value="${isHexbinC.itemCode}" <c:if test="${strCfg.isHexbin==isHexbinC.itemCode || (strCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
+						<option value="${isHexbinC.itemCode}" <c:if test="${strCfg.isHexbin==isHexbinC.itemCode || (strCfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
 					</c:forEach>
 				</select>
 			</div>