From 3f2a2af35f87dfcd508157c438a8d71b9d8bb9f2 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Sat, 29 Dec 2018 18:46:23 +0600
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=9F=E5=90=8D=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=BA=A6=E9=80=89=E9=A1=B9=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/complexCfgForm.jsp      | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 9dfcf6a13..6294938c4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -26,27 +26,6 @@
 	</div>
 </div>
 <br>
-<!-- 域名拦截增加拦截强度 -->
-<c:if test="${_cfg.functionId eq 200}">
-	<div class="row hidden intensity">
-		<div class="col-md-6">
-			<div class="form-group">
-				<label class="control-label col-md-3"><font color="red">*</font>
-						<spring:message code="intercept_intensity" />
-				</label>
-				<div class="col-md-6">
-					<select name="userRegion5"
-					class="selectpicker show-tick form-control required">
-						<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
-							<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
-						</c:forEach>
-					</select>
-				</div>
-				<div for="userRegion5"></div>
-			</div>
-		</div>
-	</div>
-</c:if>
 <c:if test="${!empty region.configDistrict }">
 	<div class="row">
 		<div class="col-md-6">
@@ -127,7 +106,25 @@
 			<div for="${cfgName}.cfgKeywords"></div>
 		</div>
 	</div>
-	
+	<!-- 域名拦截增加拦截强度 -->
+	<c:if test="${_cfg.functionId eq 200}">
+		<div class="col-md-6 hidden intensity">
+			<div class="form-group">
+				<label class="control-label col-md-3"><font color="red">*</font>
+						<spring:message code="intercept_intensity" />
+				</label>
+				<div class="col-md-6">
+					<select name="userRegion5"
+					class="selectpicker show-tick form-control required">
+						<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
+							<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
+						</c:forEach>
+					</select>
+				</div>
+				<div for="userRegion5"></div>
+			</div>
+		</div>
+	</c:if>
 </div>
 <c:if test="${serviceId eq 1025}">
 	<div class="row L3_header hidden">