From 50e87fb8538e9f7a65befa34cf19ecfb779d1b3f Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Mon, 3 Dec 2018 18:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3IP=E4=B8=A2=E5=BC=83=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=9B=9E=E8=B0=83?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=B8=BB=E8=A1=A8=E6=97=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=9F=A5=E8=AF=A2=E5=AD=90=E8=A1=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationService.java         | 21 +++++++++++--------
 src/main/resources/service/service_config.xml |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 507a93422..a77c503e7 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -1509,16 +1509,19 @@ public class ConfigSynchronizationService  extends BaseService{
 		List newList = new ArrayList();
 		if(entity.getServiceId().equals(3)){//ip drop回调类配置用了主表和子表关系
 			list = configSynchronizationDao.getCfgIndexList(entity);
-			List<Integer> compileIds = Lists.newArrayList();
-			for(int i=0;i<list.size();i++){
-				CfgIndexInfo cfg = (CfgIndexInfo) list.get(i);
-				compileIds.add(cfg.getCompileId());
-			}
-			List subList = configSynchronizationDao.getIpDropList("ip_port_cfg", compileIds);
-			for(int i=0;i<subList.size();i++){
-				IpPortCfg cfg = (IpPortCfg) subList.get(i);
-				newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
+			if(!StringUtil.isEmpty(list)){
+				List<Integer> compileIds = Lists.newArrayList();
+				for(int i=0;i<list.size();i++){
+					CfgIndexInfo cfg = (CfgIndexInfo) list.get(i);
+					compileIds.add(cfg.getCompileId());
+				}
+				List subList = configSynchronizationDao.getIpDropList("ip_port_cfg", compileIds);
+				for(int i=0;i<subList.size();i++){
+					IpPortCfg cfg = (IpPortCfg) subList.get(i);
+					newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
+				}
 			}
+			
 		}else{
 			if(className.equals("AvFileSampleCfg")){
 				list = configSynchronizationDao.getAvFileCfgList(entity);
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 0c6a1d8a5..dfb941c41 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -18,7 +18,7 @@
 	    	<serviceCfg cfgType="1" tableName="asn_ip_cfg"  groupReuse="true" groupId="userRegion4"></serviceCfg>
 	    	<userRegion regionKey="ASN_ID" regionColumn="userRegion5" userRegionPosition="0"  ></userRegion>
 	</service>
-	<service id="3" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃">
+	<service id="3" functionId="5" serviceType="2" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP丢弃">
 	    	<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
 	</service>
 	<service id="514" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP限速">