From 6cb6d6bbc2c2c3bd2f29d84729928df95c6d59bf Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Mon, 19 Nov 2018 18:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ip=E9=85=8D=E7=BD=AE=E5=9F=9F?=
 =?UTF-8?q?=E7=9A=84=E5=9F=9FID=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 07d4bd7ca..1b3970622 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -373,7 +373,9 @@ public abstract class BaseService {
 			List numRegionList = new ArrayList();
 			Integer groupId = 0;
 			Integer numGroupId = 0;
-			for(T srcCfg:srcList){
+			List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
+			for(int i=0;i<srcList.size();i++){
+				T srcCfg = srcList.get(i);
 				BaseIpCfg baseIpCfg = new BaseIpCfg();
 				BeanUtils.copyProperties(srcCfg, baseIpCfg);
 				IpCfg cfg = new IpCfg();
@@ -393,9 +395,12 @@ public abstract class BaseService {
 				cfg.setAuditTime(baseCfg.getAuditTime());
 				cfg.setIsValid(baseCfg.getIsValid());
 				List<IpCfg> cfgs = ipConvert(cfg,baseIpCfg);
-				List<Integer> ids=ConfigServiceUtil.getId(3, cfgs.size());
-				for(int i=0;i<cfgs.size();i++) {
-					cfgs.get(i).setRegionId(ids.get(i));
+				if(cfgs.size()>1){
+					List<Integer> ids=ConfigServiceUtil.getId(3, cfgs.size()-1);
+					regionIdList.addAll(ids);
+				}
+				for(int j=i;j<cfgs.size()+i;j++) {
+					cfgs.get(j-i).setRegionId(regionIdList.get(j));
 				}
 				dstList.addAll(cfgs);