From eab1a85554346dcf8a3e4433dca198887235537c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Thu, 20 Jun 2019 18:47:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E5=80=BC=E5=9F=9F?=
 =?UTF-8?q?=E6=97=A0=E5=8D=8F=E8=AE=AEID=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E4=B8=8B=E5=8F=91=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/ConfigConvertUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/util/ConfigConvertUtil.java b/src/main/java/com/nis/util/ConfigConvertUtil.java
index 51b224ab4..d834058d3 100644
--- a/src/main/java/com/nis/util/ConfigConvertUtil.java
+++ b/src/main/java/com/nis/util/ConfigConvertUtil.java
@@ -633,10 +633,10 @@ public class ConfigConvertUtil {
 
 				// 如果protocolId非空非零，需要构造数值型域配置，多条相同协议的IP只需要一条数值域配置（目前没有不同协议IP&情况）
 				//分组复用每个IP组还需要不同的数值域组么？？？？？
-				if (baseCfg!=null&&baseCfg.getServiceId()!=null&&baseCfg.getServiceId()!=0&&dictMap.containsKey(baseCfg.getServiceId())) {
+				if (baseCfg!=null&&baseCfg.getServiceId()!=null&&baseCfg.getServiceId()>0&&dictMap.containsKey(baseCfg.getServiceId())) {
 					FunctionServiceDict dict=dictMap.get(baseCfg.getServiceId());
 					Integer protocolId=dict.getProtocolId();
-					if (!numGroupVals.contains(protocolId)) {
+					if (protocolId>0&&!numGroupVals.contains(protocolId)) {
 						GroupCfg group1 = new GroupCfg();
 						group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
 						group1.setCompileId(baseCfg.getCompileId());