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

Bug修改

Browse Source
This commit is contained in:
zhangdongxu
2018-06-05 09:15:38 +08:00
parent 699f81edbc
commit 7f08efb88d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/util/ReadMaatXmlUtil.java
View File

@@ -132,6 +132,8 @@ public class ReadMaatXmlUtil {
maatXmlExpr.setType(18); maatXmlExpr.setType(18);
} else if (ele.getTextTrim().contains("un_maat_table_name")) { } else if (ele.getTextTrim().contains("un_maat_table_name")) {
maatXmlExpr.setType(0); maatXmlExpr.setType(0);
}else{
maatXmlExpr.setType(-1);
} }
} }
if (ele.getName().toLowerCase().equals("valueexpression")) { if (ele.getName().toLowerCase().equals("valueexpression")) {

2
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -1205,7 +1205,7 @@ public class ConfigSourcesService extends BaseService {
if (!StringUtil.isEmpty(configCompile.getStrRegionList())) { if (!StringUtil.isEmpty(configCompile.getStrRegionList())) {
dstMaplList = new ArrayList<Map<String,String>>(); dstMaplList = new ArrayList<Map<String,String>>();
for (StrRegion region : configCompile.getStrRegionList()) { for (StrRegion region : configCompile.getStrRegionList()) {
if(!StringUtil.isEmpty(region.getDistrict())){ if(StringUtil.isEmpty(region.getDistrict())){
dstMaplList.add(convertObjectToMap(region, StrRegion.class)); dstMaplList.add(convertObjectToMap(region, StrRegion.class));
}else{ }else{
if (StringUtil.isEmpty(strongMapList)) { if (StringUtil.isEmpty(strongMapList)) {