From 765d9a9ced961e9e78457a4cc4ddbb21d9842f08 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 8 Jun 2018 11:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=9A=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AAip=E5=9F=9F=E4=B8=BA=E6=88=96=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=EF=BC=8C=E5=85=B1=E7=94=A8=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?groupId=20=E4=BE=8B=EF=BC=9A=E5=90=8C=E4=B8=80compileId?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=8C=BA=E5=9F=9FIP=EF=BC=8C=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E5=8C=BA=E5=9F=9FIP=E6=88=96=E6=BB=A1=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/service/BaseService.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index eefc3424a..b1ec6e18b 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -278,19 +278,20 @@ public abstract class BaseService {
 			List numRegionList = new ArrayList();
 			Integer groupId = 0;
 			for(int i=0;i<srcList.size();i++){
+				GroupCfg group = new GroupCfg();
 				BaseIpCfg baseIpCfg = (BaseIpCfg) srcList.get(i);
 				IpCfg cfg = new IpCfg();
 				BeanUtils.copyProperties(baseIpCfg, cfg);
-				GroupCfg group = new GroupCfg();
 				if(!cfg.getCfgType().equals(regionValue)){
-					group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
+					groupId = ConfigServiceUtil.getId(2, 1).get(0);
+					group.setGroupId(groupId);
 					group.setCompileId(baseCfg.getCompileId());
 					group.setAuditTime(baseCfg.getAuditTime());
 					group.setIsValid(baseCfg.getIsValid());
 					groupRelationList.add(group);
 				}
 				
-				cfg.setGroupId(group.getGroupId());
+				cfg.setGroupId(groupId);
 				cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
 				cfg.setAuditTime(baseCfg.getAuditTime());
 				cfg.setIsValid(baseCfg.getIsValid());