diff --git a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java
index b8b97ce2b..85a793778 100644
--- a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java
+++ b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java
@@ -70,6 +70,7 @@ public class ScheduleUpdateInterceptor extends BaseInterceptor{
EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.SchedulerDao.updateCfgTableStatus");
EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.basics.ServiceDictInfoDao");
EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.PxyObjKeyringDao.updatePxyObjTrustedCaCrl");
+ EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.CommonPolicyDao.auditCfgBatch");
}
/**
* is_valid 字段名
diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 9979908d1..b8f863adb 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -3240,6 +3240,15 @@ public class BaseController {
}
}
}
+
+ //批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
+ if(!StringUtil.isEmpty(entity)) {
+ BaseCfg base=(BaseCfg)entity ;
+ if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+ base.setIsValid(null);
+ BeanUtils.copyProperties(base, entity);
+ }
+ }
}
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index c573831b3..69d849a3a 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -40,7 +40,13 @@
-
+
+
+
+
+
+
+
-
+
+
-
+
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 0d1d38148..36efa09d7 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -247,18 +247,27 @@ function cancelPassOpt(url){
}
}else{
- /* 批量下发待测试
- if(url.indexOf("functionId") > -1){
+ //批量下发待测试
+ if(url.indexOf("functionId=6") > -1 //http url
+ || url.indexOf("functionId=7") > -1 //dns
+ || url.indexOf("functionId=37") > -1 //mail address
+ || url.indexOf("functionId=35") > -1 //mail advanced
+ || url.indexOf("functionId=210") > -1 //https monitor
+ || url.indexOf("functionId=207") > -1 //mail block
+ || url.indexOf("functionId=208") > -1 //mail redirect
+ || url.indexOf("functionId=209") > -1 //mail replace
+ || url.indexOf("functionId=211") > -1 //mail whitelist
+ ){
top.$.jBox.confirm("","",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
- }else{ */
+ }else{
top.$.jBox.tip("", "");
return;
- /* } */
+ }
}
}
function doAll(checkboxes,url){