From 246ee9ec9a5380b996bd09b5391b985eadaf4566 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 13 Aug 2018 10:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=9F=9F=E5=90=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9A=20=E8=BF=9B=E5=85=81=E8=AE=B8=E6=97=A0?=
 =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=EF=BC=8C=E5=90=8C=E6=97=B6=E8=BF=9B?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=8F=B3=E5=8C=B9=E9=85=8D=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=9F=9F=E5=90=8D=E6=8B=A6=E6=88=AA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=89=80=E6=9C=89=E5=B1=9E=E6=80=A7=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=9D=87=E4=BD=BF=E7=94=A8expr=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp | 8 ++++++--
 src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
index 8a3af0d6a..938565b01 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
@@ -180,7 +180,7 @@
 										        <div class="form-group">
 										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
 										            <div class="col-md-6">
-										            	<label class="radio-inline">
+										            	<label class="radio-inline hidden">
 										            		<input type="radio" name="exprType" value="1" class="required"
 										            			<c:if test="${_cfg.exprType==1}">checked</c:if>
 										            		><spring:message code="and_expression"/>
@@ -200,7 +200,11 @@
 										            <div class="col-md-6">
 										            	<select name="matchMethod" class="selectpicker select2 form-control required" >
 															<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+																<c:if test="${matchMethodC.itemCode eq 1}">
+																	<option value="${matchMethodC.itemCode}"  selected >
+																	<spring:message code="${matchMethodC.itemValue}"/>
+																	</option>
+																</c:if>
 									               			</c:forEach>     
 														</select>
 										            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
index e97082b03..9ff13147e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
@@ -311,18 +311,18 @@
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchC">
-											<c:if test="${cfg.exprType eq matchC.itemCode}"><spring:message code="${matchC.itemValue }"/></c:if>
+											<c:if test="${cfg.matchMethod eq matchC.itemCode}"><spring:message code="${matchC.itemValue }"/></c:if>
 										</c:forEach>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="hexC">
-											<c:if test="${cfg.exprType eq hexC.itemCode}"><spring:message code="${hexC.itemValue }"/></c:if>
+											<c:if test="${cfg.isHexbin eq hexC.itemCode}"><spring:message code="${hexC.itemValue }"/></c:if>
 										</c:forEach>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('WHETHER_AREA_BLOCK')}" var="areaC">
-											<c:if test="${cfg.exprType eq areaC.itemCode and areaC.itemValue eq 'no'}"><spring:message code="${areaC.itemValue }"/></c:if>
-											<c:if test="${cfg.exprType eq areaC.itemCode and areaC.itemValue eq 'yes'}">
+											<c:if test="${cfg.isAreaEffective eq areaC.itemCode and areaC.itemValue eq 'no'}"><spring:message code="${areaC.itemValue }"/></c:if>
+											<c:if test="${cfg.isAreaEffective eq areaC.itemCode and areaC.itemValue eq 'yes'}">
 											<a href="javascript:viewAreaInfo('${ctx }','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
 													<spring:message code="${areaC.itemValue }"/>
 												</a>