From bac61bf27b0f3a93bf2768ff4d3256528a65397c Mon Sep 17 00:00:00 2001
From: zhangdongxu <zhangdongxu@intranet.com>
Date: Mon, 4 Jun 2018 16:31:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9tableName=E7=9A=84?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E4=B8=8D=E9=AA=8C=E8=AF=81service=E4=B8=8EtableName=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=EF=BC=9B=202=E3=80=81maat=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=9F=9F?=
 =?UTF-8?q?=E5=92=8C=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=9F=9F?=
 =?UTF-8?q?=E5=88=86=E6=88=90=E4=B8=A4=E4=B8=AAlist=E4=BC=A0=E7=BB=99?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/CompileVal.java    |  7 +++---
 .../service/restful/ConfigSourcesService.java | 23 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nis/util/CompileVal.java b/src/main/java/com/nis/util/CompileVal.java
index 69bf0fb..4f154ec 100644
--- a/src/main/java/com/nis/util/CompileVal.java
+++ b/src/main/java/com/nis/util/CompileVal.java
@@ -175,7 +175,8 @@ public class CompileVal {
 			for (NumRegion numRegion : numRegionList) {
 				// if (configCompile.getIsValid() != 0 &&
 				// !regionGroupIdList.contains(numRegion.getGroupId())) {
-				if (!type2TableNameIsOk(configCompile.getService(), numRegion.getTableName())) {
+				
+				if (!StringUtil.isEmpty(numRegion.getTableName())&&!type2TableNameIsOk(configCompile.getService(), numRegion.getTableName())) {
 					return "配置id为" + configCompile.getCompileId() + "的配置中numRegionList中的regionid为"
 							+ numRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致";
 				}
@@ -221,7 +222,7 @@ public class CompileVal {
 			for (StrRegion strRegion : strRegionList) {
 				// if (configCompile.getIsValid() != 0 &&
 				// !regionGroupIdList.contains(strRegion.getGroupId())) {
-				if (!type2TableNameIsOk(configCompile.getService(), strRegion.getTableName())) {
+				if (!StringUtil.isEmpty(strRegion.getTableName())&&!type2TableNameIsOk(configCompile.getService(), strRegion.getTableName())) {
 					return "配置id为" + configCompile.getCompileId() + "的配置中strRegionList中的regionid为"
 							+ strRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致";
 				}
@@ -269,7 +270,7 @@ public class CompileVal {
 			for (IpRegion ipRegion : ipRegionList) {
 				// if (configCompile.getIsValid() != 0 &&
 				// !regionGroupIdList.contains(ipRegion.getGroupId())) {
-				if (!type2TableNameIsOk(configCompile.getService(), ipRegion.getTableName())) {
+				if (!StringUtil.isEmpty(ipRegion.getTableName())&&!type2TableNameIsOk(configCompile.getService(), ipRegion.getTableName())) {
 					return "配置id为" + configCompile.getCompileId() + "的配置中ipRegionList中的regionid为"
 							+ ipRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致";
 				}
diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
index dbd6db4..2e08dbc 100644
--- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
+++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
@@ -1201,22 +1201,25 @@ public class ConfigSourcesService extends BaseService {
 			maatConfig.setGroupMapList(dstMaplList);
 			//字符串域
 			dstMaplList = null;
+			List<Map<String, String>> strongMapList = null;
 			if (!StringUtil.isEmpty(configCompile.getStrRegionList())) {
 				dstMaplList = new ArrayList<Map<String,String>>();
 				for (StrRegion region : configCompile.getStrRegionList()) {
-					dstMaplList.add(convertObjectToMap(region, StrRegion.class));
+					if(!StringUtil.isEmpty(region.getDistrict())){
+						dstMaplList.add(convertObjectToMap(region, StrRegion.class));
+					}else{
+						if (StringUtil.isEmpty(strongMapList)) {
+							strongMapList = new ArrayList<Map<String,String>>();
+						}
+						strongMapList.add(convertObjectToMap(region, StrRegion.class));
+					}
 				}
 			}	
 			maatConfig.setStrRegionMapList(dstMaplList);
-//			//增强字符串域
-//			dstMaplList = null;
-//			if (!StringUtil.isEmpty(strStrongRegionList)) {
-//				dstMaplList = new ArrayList<Map<String,String>>();
-//				for (StrRegion region : strStrongRegionList) {
-//					dstMaplList.add(convertObjectToMap(region, StrRegion.class));
-//				}
-//			}	
-//			maatConfig.setStrStrRegionMapList((dstMaplList));
+//			增强字符串域
+			if (!StringUtil.isEmpty(strongMapList)&&strongMapList.size()>0) {
+				maatConfig.setStrStrRegionMapList((dstMaplList));
+			}
 			//数值域
 			dstMaplList = null;
 			if (!StringUtil.isEmpty(configCompile.getNumRegionList())) {