diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index 4f165e93a..3e22080c4 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -531,7 +531,7 @@ public class FileTransferCfgService extends CrudService 0)) { NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg(); - BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId"}); + BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId","cfgType"}); stringCfgDao.updateSubscribeIdCfg(cfg); } @@ -565,6 +565,12 @@ public class FileTransferCfgService extends CrudService 0)) { + Map subIdMap = cfgConvert(strRegionList,entity.getNtcSubscribeIdCfgList(),2,entity,groupRelationList); + groupRelationList=subIdMap.get("groupList"); + strRegionList=subIdMap.get("dstList"); + } if(areaIpCfgList != null && areaIpCfgList.size() >0){ Map areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList); diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index 4f4dd7d7e..9ff08b6da 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -56,9 +56,9 @@ }); */ if(flag){ //将disable属性的元素删除 - /* $(".disabled").each(function(){ + $(".disabled").each(function(){ $(this).remove(); - }); */ + }); $("input[name$='exprType']").attr("disabled",false); /* if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){ $("input[name$='exprType']").val(1); @@ -130,10 +130,10 @@ - - + + + +
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp index 6d2d6a00c..4bce0abb5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestSubList.jsp @@ -11,6 +11,18 @@ + +
+
+
+
+ +
+
+
+
+
+