gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测试程序生成字符串类配置和增强字符串类配置时使用同一个list,字符串类配置被覆盖的问题

Browse Source
This commit is contained in:
renkaige
2018-10-12 11:39:14 +08:00
parent bbf10f2438
commit 30e31f8f88
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/restful/MaatTestController.java
View File

@@ -294,8 +294,7 @@ public class MaatTestController {
} }
configCompile.setNumRegionList(numList); configCompile.setNumRegionList(numList);
} else if (tableType == 14 || tableType == 15) { } else if (tableType == 14 || tableType == 15) {
strList = new ArrayList<StrRegion>(); // strList = new ArrayList<StrRegion>();
if (tableNameArr.length == 1) { if (tableNameArr.length == 1) {
strList.add(getStrRegion(service, tableType, groupId, null)); strList.add(getStrRegion(service, tableType, groupId, null));
} else { } else {
@@ -303,6 +302,9 @@ public class MaatTestController {
strList.add(getStrRegion(service, tableType, groupId, tableName)); strList.add(getStrRegion(service, tableType, groupId, tableName));
} }
} }
if(configCompile.getStrRegionList()!=null&&configCompile.getStrRegionList().size()>0) {
strList.addAll(configCompile.getStrRegionList());//因为字符串和增强字符串使用的是一个strlist所以这里把这俩的值放在一块
}
configCompile.setStrRegionList(strList); configCompile.setStrRegionList(strList);
} else if (tableType == 16) { } else if (tableType == 16) {
digestList = new ArrayList<DigestRegion>(); digestList = new ArrayList<DigestRegion>();