diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 6a58c7ea7..6e0acd247 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -264,15 +264,15 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected Integer groupId;//仅用于copy属性使用 protected Integer regionId;//仅用于copy属性使用 -// protected Integer numberRegionGroupId;//仅用于copy属性使用 + protected Integer numberRegionGroupId;//仅用于copy属性使用 protected Integer numberRegionRegionId;//仅用于copy属性使用 -// public Integer getNumberRegionGroupId() { -// return numberRegionGroupId; -// } -// public void setNumberRegionGroupId(Integer numberRegionGroupId) { -// this.numberRegionGroupId = numberRegionGroupId; -// } + public Integer getNumberRegionGroupId() { + return numberRegionGroupId; + } + public void setNumberRegionGroupId(Integer numberRegionGroupId) { + this.numberRegionGroupId = numberRegionGroupId; + } public Integer getNumberRegionRegionId() { return numberRegionRegionId; } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f36a6df61..20259d0f9 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1507,7 +1507,7 @@ public class BaseController { List compileIds=Lists.newArrayList(); List regionIds=Lists.newArrayList(); List groupIds=Lists.newArrayList(); -// List numRegionGroupIds=Lists.newArrayList(); + List numRegionGroupIds=Lists.newArrayList(); List numRegionRegionIds=Lists.newArrayList(); if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取 try { @@ -1517,7 +1517,7 @@ public class BaseController { regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); //需要获取数值域的id if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) { -// numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); + numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); } } @@ -1558,9 +1558,9 @@ public class BaseController { cfg.setRegionId(regionIds.get(ind)); } if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { -// if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { -// cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); -// } + if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { + cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); + } if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) { cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind)); } diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index e84df21e6..81d713678 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -600,7 +600,12 @@ public abstract class BaseService { if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) { if (numGroupId == 0) { GroupCfg group1 = new GroupCfg(); - group1.setGroupId(groupId); + //group1.setGroupId(groupId); + if(baseIpCfg.getNumberRegionGroupId()!=null) { + group1.setGroupId(baseIpCfg.getNumberRegionGroupId()); + }else { + group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0)); + } group1.setCompileId(baseIpCfg.getCompileId()); group1.setAuditTime(baseIpCfg.getAuditTime()); group1.setIsValid(baseIpCfg.getIsValid()); diff --git a/src/main/webapp/static/pages/scripts/importExcel.js b/src/main/webapp/static/pages/scripts/importExcel.js index 98520db02..35b6645b4 100644 --- a/src/main/webapp/static/pages/scripts/importExcel.js +++ b/src/main/webapp/static/pages/scripts/importExcel.js @@ -20,7 +20,7 @@ $(function(){ if($(".requestIdSel").hasClass("hidden")){ $(".attributeSel").addClass("hidden"); $(".classifySel").addClass("hidden"); - + $("select[name='requestId']").empty(); if($(".appSelDiv").length == 0){ // 新增文件div上移 var fileDiv = $(".fileSelDiv").clone();