Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

2018-11-29 11:00:04 +08:00
parent 5a8d54fe13 17d44080dc
commit 9bd196547e
14 changed files with 1008 additions and 10 deletions
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -272,6 +272,15 @@ public class ConfigSynchronizationService  extends BaseService{
 						commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
 					}
 				}
+				if(isUpdateCfg) {
+					if(tableName.equals("asn_ip_cfg")){
+						if(!StringUtil.isEmpty(asnGroupIds)) {
+							commonPolicyDao.auditCfgBatch(tableName, entity,asnGroupIds,null);
+						}
+					}else{
+						commonPolicyDao.auditCfgBatch( tableName, entity,compileIds,null);
+					}
+				}
 			}
 		}
 		//批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号），分组复用的域配置不需要重新获取regionId,groupId