From 1e4dfeedf12f66974ed65e997cc3a28c40bd0bce Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Wed, 5 Dec 2018 15:03:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=90=86=E5=8F=AF?=
 =?UTF-8?q?=E4=BF=A1=E8=AF=81=E4=B9=A6=E4=B8=8E=E5=90=8A=E9=94=80=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/ConfigSynchronizationService.java   | 4 ++--
 src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 5560f35f2..237fbf4cf 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -1578,13 +1578,13 @@ public class ConfigSynchronizationService  extends BaseService{
 				list = configSynchronizationDao.getPxyObjTrustedCertCfgList(entity);
 				for(int i=0;i<list.size();i++){
 					PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert) list.get(i);
-					newList.add(convertCallBackProxyObjTrustedCa(cfg,null));
+					newList.addAll(convertCallBackProxyObjTrustedCa(cfg,null));
 				}
 			}else if(className.equals("PxyObjTrustedCaCrl")){
 				list = configSynchronizationDao.getPxyObjTrustedCrlCfgList(entity);
 				for(int i=0;i<list.size();i++){
 					PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl) list.get(i);
-					newList.add(convertCallBackProxyObjTrustedCa(null,cfg));
+					newList.addAll(convertCallBackProxyObjTrustedCa(null,cfg));
 				}
 			}else if(className.equals("DnsResStrategy")){
 				list = configSynchronizationDao.getDnsStrategyList(entity);
diff --git a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
index e57c921e1..332065e9e 100644
--- a/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/configSyncInfo.jsp
@@ -5,7 +5,6 @@
 <title></title>
 <script type="text/javascript">
 	$(document) .ready(function() {
-		top.$.jBox.closeTip();
 		$("#cfgFrom").validate({
 				submitHandler : function(form) {
 					top.$.jBox.tip("The system is being maintained and temporarily inaccessible.",'loading',{opacity:0.5,persistent:true});