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> strongMapList = null; if (!StringUtil.isEmpty(configCompile.getStrRegionList())) { dstMaplList = new ArrayList>(); 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>(); + } + strongMapList.add(convertObjectToMap(region, StrRegion.class)); + } } } maatConfig.setStrRegionMapList(dstMaplList); -// //增强字符串域 -// dstMaplList = null; -// if (!StringUtil.isEmpty(strStrongRegionList)) { -// dstMaplList = new ArrayList>(); -// 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())) {