Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java

@@ -173,7 +173,7 @@ public class CheckIpFormatThread implements Callable<String>{
 				String userRegion1 = baseIpCfg.getUserRegion1();
 				if (StringUtils.isNotBlank(userRegion1)) {
 					Object val = DictUtils.getDictLabel("INTERCEPT_REPLACE_ZONE", userRegion1);
-					if (StringUtils.isBlank(val.toString())) {
+					if (StringUtils.isBlank(val.toString())||"默认".equals(val.toString())) {
 						errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("replace_zone"))
 								+ ";");
 					}

src/main/java/com/nis/web/service/BaseService.java

@@ -2491,6 +2491,20 @@ public abstract class BaseService {
 								}else if(regionDict.getFunctionId()==214) {
 									String userRegion="nat_type="+_cfg.getUserRegion1()+";spoofing_ip_pool="+_cfg.getUserRegion3();
 									maatCfg.setUserRegion(userRegion);
+								}else if(regionDict.getFunctionId()==212) {
+									String userRegion=Constants.REPLACE_ZONE_KEY+"="+_cfg.getUserRegion1();
+									String substitute="";
+									String userRegion2=StringUtil.isEmpty(_cfg.getUserRegion2()) ? "":_cfg.getUserRegion2();
+									substitute="/";
+									userRegion2 = BaseService.replaceContentEscape(userRegion2);
+									substitute=substitute+userRegion2;
+									
+									String userRegion3=StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3();
+									userRegion3 = BaseService.replaceContentEscape(userRegion3);
+									substitute=substitute+"/"+userRegion3;
+									
+									userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
+									maatCfg.setUserRegion(userRegion);
 								}
 								
 			                	configCompileList.add(maatCfg);

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -382,7 +382,7 @@ function cancelPassOpt(url){
 	function validateIsDelete(checkboxes){
 		var flag = false;
 		$(checkboxes).filter(":checked").each(function(){
-			alert($(this).val());
+			//alert($(this).val());
 			if($(this).val()!=0 && $(this).val()!=3){//状态为3的配置为取消审核的配置，可删除
 				flag = true;
 				return;