From b22211c758cc4494151ee2b213a92d5e18eb7404 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Tue, 4 Sep 2018 16:45:22 +0800
Subject: [PATCH] =?UTF-8?q?1.Control=20Policy=E5=AE=A1=E6=A0=B8=E6=9C=AA?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=8A=B6=E6=80=81=E7=9A=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=90=8E=E7=8A=B6=E6=80=81=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=9C=AA=E5=AE=A1=E6=A0=B8=20=202.IP=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E5=9C=B0=E5=9D=80=E6=B1=A0=E8=BF=9B=E8=A1=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=93=8D=E4=BD=9C=E6=97=B6=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98/=E6=97=B6=E9=97=B4=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/service/configuration/HttpRedirectCfgService.java  | 3 +++
 .../web/service/configuration/IpMultiplexPoolCfgService.java   | 2 --
 .../WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
index dec5bac11..9724cf007 100644
--- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
@@ -158,6 +158,9 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			}
 			
 		}else{
+			// 审核未通过状态的配置 修改后状态改为未审核
+			entity.setIsValid(0);
+			entity.setIsAudit(0);
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(new Date());
 			websiteCfgDao.updateCfgIndex(entity);
diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java
index 2790e6c2c..146bc1e37 100644
--- a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java
@@ -128,8 +128,6 @@ public class IpMultiplexPoolCfgService extends BaseService{
 		cfg.setCfgId(Long.valueOf(id));
 		cfg.setIsValid(isValid);
 		cfg.setIsAudit(isAudit);
-		cfg.setEditTime(auditTime);
-		cfg.setEditorId(UserUtils.getUser().getId());
 		cfg.setAuditorId(UserUtils.getUser().getId());
 		cfg.setAuditTime(auditTime);
 		ipMultiplexStrategyDao.update(cfg);
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
index 7183f3af1..a54182b14 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp
@@ -396,7 +396,7 @@
 			</div>
 		</div>
 	</div>
-	<<c:if test="${cfg.isHexbin==0 }">
+	<c:if test="${cfg.isHexbin==0 }">
 						<div class="row">
 							<div class="col-md-4">
 								<div class="form-group">