IP导入,url导入，SNI导入加入导入时直接审核功能

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -228,7 +228,35 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	@ExcelField(title="do_log",dictType="DO_LOG",sort=30)
 	protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
 	
+	protected Integer groupId;//仅用于copy属性使用
+	protected Integer regionId;//仅用于copy属性使用
+	protected Integer numberRegionGroupId;//仅用于copy属性使用
+	protected Integer numberRegionRegionId;//仅用于copy属性使用
 	
+	public Integer getNumberRegionGroupId() {
+		return numberRegionGroupId;
+	}
+	public void setNumberRegionGroupId(Integer numberRegionGroupId) {
+		this.numberRegionGroupId = numberRegionGroupId;
+	}
+	public Integer getNumberRegionRegionId() {
+		return numberRegionRegionId;
+	}
+	public void setNumberRegionRegionId(Integer numberRegionRegionId) {
+		this.numberRegionRegionId = numberRegionRegionId;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public Integer getRegionId() {
+		return regionId;
+	}
+	public void setRegionId(Integer regionId) {
+		this.regionId = regionId;
+	}
 	public Integer getDoLog() {
 		return doLog;
 	}
@@ -281,7 +309,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 			if(!StringUtil.isEmpty(list)) {
 				for (SysMenu menu :list) {
 					if (!StringUtil.isEmpty(menu.getCode()) 
-							&& !StringUtil.isEmpty(menu.getFunctionId()) 
+							&&menu.getFunctionId()!=null 
 							&& menu.getFunctionId().equals(functionId)
 							//&& menu.getFunctionId().equals(functionId)
 							) {

src/main/java/com/nis/domain/configuration/BaseStringCfg.java

@@ -44,7 +44,6 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	protected Integer behavCode;//仅用于copy属性使用
 	protected Integer specServiceId;//仅用于copy属性使用
 	protected String domain;//仅用于copy属性使用
-	
 	public String getDomain() {
 		return domain;
 	}
@@ -251,4 +250,17 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	public void setIndex(Integer index) {
 		this.index = index;
 	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public Integer getRegionId() {
+		return regionId;
+	}
+	public void setRegionId(Integer regionId) {
+		this.regionId = regionId;
+	}
+	
 }