diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
index f97925780..02b093af5 100644
--- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
@@ -352,29 +352,17 @@ public class AvContentCfgService extends BaseService{
 		
 		if(isAudit==1){
 			if(!StringUtil.isEmpty(voipIpList)){
-				//TODO DELETE后期删除
-				for (AvVoipIpCfg ipCfg : voipIpList) {
-					ipCfg.setCfgType("MM_VOIP_IP");
-				}
 				Map<String,List> ipMap = cfgConvert(ipRegionList,voipIpList,1,entity,groupRelationList);
 				groupRelationList=ipMap.get("groupList");
 				ipRegionList=ipMap.get("dstList");
 			}
 			
 			if(!StringUtil.isEmpty(voipAccountList)){
-				//TODO DELETE后期删除
-				for (AvVoipAccountCfg accountCfg : voipAccountList) {
-					accountCfg.setCfgType("MM_VOIP_ACCOUNT");
-				}
 				Map<String,List> accountMap = cfgConvert(strRegionList,voipAccountList,2,entity,groupRelationList);
 				groupRelationList=accountMap.get("groupList");
 				strRegionList=accountMap.get("dstList");
 			}
 			if(!StringUtil.isEmpty(areaIpCfgList)){
-				//TODO DELETE后期删除 
-				for (AreaIpCfg areaIpCfga : areaIpCfgList) {
-					areaIpCfga.setCfgType("NTC_IP_RANGE");
-				}
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
 				areaIpRegionList=areaMap.get("dstList");
@@ -652,19 +640,11 @@ public class AvContentCfgService extends BaseService{
 		
 		if(isAudit==1){
 			if(!StringUtil.isEmpty(list)){
-				//TODO DELETE后期删除
-				for (BaseIpCfg ipCfg : list) {
-					ipCfg.setCfgType("MM_AV_IP");
-				}
 				Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
 				groupRelationList=ipMap.get("groupList");
 				ipRegionList=ipMap.get("dstList");
 			}
 			if(!StringUtil.isEmpty(areaIpCfgList)){
-				//TODO DELETE后期删除
-				for (AreaIpCfg areaIpCfga : areaIpCfgList) {
-					areaIpCfga.setCfgType("NTC_IP_RANGE");
-				}
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
 				areaIpRegionList=areaMap.get("dstList");
@@ -940,20 +920,12 @@ public class AvContentCfgService extends BaseService{
 		if(isAudit==1){
 			if(!StringUtil.isEmpty(list)){
 				
-				//TODO DELETE后期删除
-				for (BaseIpCfg ipCfg : list) {
-					ipCfg.setCfgType("MM_PIC_IP");
-				}
 				Map<String,List> ipMap = cfgConvert(ipRegionList,list,1,entity,groupRelationList);
 				groupRelationList=ipMap.get("groupList");
 				ipRegionList=ipMap.get("dstList");
 			}
 			
 			if(!StringUtil.isEmpty(areaIpCfgList)){
-				//TODO DELETE后期删除
-				for (AreaIpCfg areaIpCfga : areaIpCfgList) {
-					areaIpCfga.setCfgType("NTC_IP_RANGE");
-				}
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
 				areaIpRegionList=areaMap.get("dstList");
@@ -1194,20 +1166,12 @@ public class AvContentCfgService extends BaseService{
 		
 		if(isAudit==1){
 			if(!StringUtil.isEmpty(list)){
-				//TODO DELETE后期删除
-				for (BaseStringCfg strCfg : list) {
-					strCfg.setCfgType("MM_AV_URL");
-				}
 				Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
 				groupRelationList=strMap.get("groupList");
 				strRegionList=strMap.get("dstList");
 			}
 			
 			if(!StringUtil.isEmpty(areaIpCfgList)){
-				//TODO DELETE后期删除
-				for (AreaIpCfg areaIpCfga : areaIpCfgList) {
-					areaIpCfga.setCfgType("NTC_IP_RANGE");
-				}
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
 				areaIpRegionList=areaMap.get("dstList");
@@ -1447,20 +1411,12 @@ public class AvContentCfgService extends BaseService{
 		
 		if(isAudit==1){
 			if(!StringUtil.isEmpty(list)){
-				//TODO DELETE后期删除
-				for (BaseStringCfg strCfg : list) {
-					strCfg.setCfgType("MM_PIC_URL");
-				}
 				Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
 				groupRelationList=strMap.get("groupList");
 				strRegionList=strMap.get("dstList");
 			}
 			
 			if(!StringUtil.isEmpty(areaIpCfgList)){
-				//TODO DELETE后期删除
-				for (AreaIpCfg areaIpCfga : areaIpCfgList) {
-					areaIpCfga.setCfgType("NTC_IP_RANGE");
-				}
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
 				areaIpRegionList=areaMap.get("dstList");
diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
index 3b1a58f1b..a20958714 100644
--- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
@@ -270,7 +270,6 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 			maatCfg.setGroupNum(groupRelationList.size());
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());
-			maatCfg.setUserRegion(entity.getCompileId()+"");
 			configCompileList.add(maatCfg);
 			maatBean.setConfigCompileList(configCompileList);
 			maatBean.setAuditTime(entity.getAuditTime());
diff --git a/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java b/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java
index 02e70e65c..f8ebb2231 100644
--- a/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java
+++ b/src/main/java/com/nis/web/service/configuration/ControlPolicyService.java
@@ -198,10 +198,6 @@ public class ControlPolicyService extends BaseService{
 				strRegionList=strMap.get("dstList");
 			}
 			if(!StringUtil.isEmpty(areaIpCfgList)){
-				//TODO DELETE后期删除
-				for (AreaIpCfg areaIpCfga : areaIpCfgList) {
-					areaIpCfga.setCfgType("NTC_IP_RANGE");
-				}
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
 				areaIpRegionList=areaMap.get("dstList");
diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 179f759cc..726ffb3ef 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -463,9 +463,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		if(isAudit==1){
-				//TODO DELETE后期删除
+				
 				entity.setAreaEffectiveIds(StringUtils.isEmpty(entity.getAreaEffectiveIds()) ? "0":entity.getAreaEffectiveIds());
-				entity.setCfgType("NTC_FILE_DIGEST");
 				
 				Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
 				groupRelationList=map.get("groupList");
@@ -475,10 +474,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 				}
 				
 				if(areaIpCfgList != null && areaIpCfgList.size() >0){
-					//TODO DELETE后期删除
-					for (AreaIpCfg areaIpCfga : areaIpCfgList) {
-						areaIpCfga.setCfgType("NTC_IP_RANGE");
-					}
 					Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 					groupRelationList=areaMap.get("groupList");
 					areaIpRegionList=areaMap.get("dstList");
@@ -497,8 +492,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			maatCfg.setDigestRegionList(digestRegionList);
 			maatCfg.setGroupRelationList(groupRelationList);
 			maatCfg.setGroupNum(groupRelationList.size());
-			//TODO 后期修改
-			
 			maatCfg.setAreaIpRegionList(areaIpRegionList);
 			maatCfg.setIsValid(entity.getIsValid());