From 0b1a51aa4726058a1a1d62a5655ab9d7c0342ff7 Mon Sep 17 00:00:00 2001
From: 段冬梅 <duandongmei@zdjizhi.com>
Date: Wed, 24 Apr 2019 09:54:50 +0800
Subject: 修复加密隧道协议不显示定时任务图标BUG;
 修复批量之后无法查询所有状态数据bug
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/controller/BaseController.java        | 2 +-
 src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 8358ff057..7e848536e 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -3296,7 +3296,7 @@ public class BaseController {
  		//批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
 		if(!StringUtil.isEmpty(entity)) {
 			BaseCfg base=(BaseCfg)entity ;
-			if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+			if(!StringUtil.isEmpty(base.getSeltype()) && base.getSeltype().equals("isValid")) {
 				base.setIsValid(null);
 				BeanUtils.copyProperties(base, entity);
 			}
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 8302fb491..b07a6c508 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -461,7 +461,7 @@
 									</td>
 									<td class="schedulerFlag">
 										<c:choose>
-											<c:when test="${not empty indexCfg.schedule }">
+											<c:when test="${not empty cfg.schedule }">
 												<span isScheduler="yes">
 													<i class="icon-clock icon-state-danger"></i>
 												</span>
-- 
cgit v1.2.3