diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 2aedcbd31..098c4c729 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -2636,9 +2636,18 @@ public class BaseController { cfg.setIsValid(entity.getIsValid()); cfg.setAuditTime(entity.getAuditTime()); newList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); - //TODO 要保证cert下发成功crl必须也同时下发成功,需要单个查询 ids.add(cfg.getCompileId()); } + if(!StringUtil.isEmpty(ids)) { + list=new ArrayList<>(); + list=commonPolicyService.getPxyObjTrustedCrlCfgListByCertId(ids); + for(int i=0;i - - and user_region1 in - - #{compileId} - - - - and asn_ip_group in - - #{compileId} - - - - and compile_id in - - #{compileId} - - - + + + and user_region1 in + + #{compileId} + + + + and asn_ip_group in + + #{compileId} + + + + and cert_id in + + #{compileId} + + + + and compile_id in + + #{compileId} + + + diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java index d3793a831..6654b272d 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java @@ -83,6 +83,7 @@ public interface ConfigSynchronizationDao { public List getPxyObjKeyringCfgList(BaseCfg entity); public List getPxyObjTrustedCertCfgList(BaseCfg entity); public List getPxyObjTrustedCrlCfgList(BaseCfg entity); + public List getPxyObjTrustedCrlCfgListByCertId(@Param("certIds")List certIds); public List getDnsStrategyList(BaseCfg entity); public List getDnsIpCfgList(BaseCfg entity); public List getIpPortListByService(BaseCfg entity); diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml index 1a5d6eb58..b68e07106 100644 --- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml @@ -1165,9 +1165,21 @@ and a.is_valid=#{isValid} and a.is_audit=#{isAudit} and a.is_valid!=-1 + and (cert_id is null or cert_id == 0) ORDER BY a.CFG_ID +