From c81bb25f2255ee6dee9ae275c83cdd3d87f2a513 Mon Sep 17 00:00:00 2001 From: DuanDongmei Date: Thu, 29 Nov 2018 09:34:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/service/configuration/IpCfgService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 91c74f593..e06fe9407 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -206,7 +206,7 @@ public class IpCfgService extends CrudService { entity.setFunctionId(functionId); ipCfgDao.updateCfgValid(entity); //查询子配置 - entity = this.getIpPortCfg(Long.parseLong(id)); + entity = this.getIpPortCfg(Long.parseLong(id),entity.getCompileId()); if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){ IpPortCfg cfg = new IpPortCfg(); BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); @@ -468,7 +468,7 @@ public class IpCfgService extends CrudService { List dictList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); int maatType=0; //查询子配置并修改审核状态 - entity = this.getIpPortCfg(entity.getCfgId()); + entity = this.getIpPortCfg(entity.getCfgId(),entity.getCompileId()); if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){ //判断下发类型是走maat还是callback String regionValue=entity.getIpPortList().get(0).getCfgType(); @@ -827,8 +827,8 @@ public class IpCfgService extends CrudService { public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){ return ipCfgDao.getById(baseIpCfg.getTableName(), baseIpCfg.getCfgId()); } - public CfgIndexInfo getIpPortCfg(Long cfgId){ - CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId); + public CfgIndexInfo getIpPortCfg(Long cfgId,Integer compileId){ + CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId,compileId); List ipPortList = ipCfgDao.getIpPortList(entity); List subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity); entity.setIpPortList(ipPortList);