diff options
| author | 段冬梅 <[email protected]> | 2019-04-24 09:54:50 +0800 |
|---|---|---|
| committer | 段冬梅 <[email protected]> | 2019-04-24 09:54:50 +0800 |
| commit | 0b1a51aa4726058a1a1d62a5655ab9d7c0342ff7 (patch) | |
| tree | a8b0d352d849759b5f62909333ab4d28db8f287d | |
| parent | 40e166510c7d665d2d1335305d71cbb40652a681 (diff) | |
修复加密隧道协议不显示定时任务图标BUG;
修复批量之后无法查询所有状态数据bug
| -rw-r--r-- | src/main/java/com/nis/web/controller/BaseController.java | 2 | ||||
| -rw-r--r-- | 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>
|