From 30e31f8f88a4da624b93e60260d43c3b319d0864 Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@nismail.iie.ac.cn>
Date: Fri, 12 Oct 2018 11:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=94=9F=E6=88=90=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=92=8C=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=B2=E7=B1=BB=E9=85=8D=E7=BD=AE=E6=97=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AAlist,=E5=AD=97=E7=AC=A6=E4=B8=B2?=
 =?UTF-8?q?=E7=B1=BB=E9=85=8D=E7=BD=AE=E8=A2=AB=E8=A6=86=E7=9B=96=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/controller/restful/MaatTestController.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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