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

修复IP配置为空的时候审核报错的bug

Browse Source
This commit is contained in:
wangxin
2018-04-08 14:09:21 +08:00
parent 2ed9333e69
commit 82eef927b8
1 changed files with 136 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
View File

@@ -859,6 +859,7 @@ public class MultipleCfgController extends BaseController{
searchIpCfg.setCompileId(compileId); searchIpCfg.setCompileId(compileId);
//根据表名，编译ID查询唯一结果 //根据表名，编译ID查询唯一结果
BaseIpCfg resultIpCfg=ipCfgService.get(searchIpCfg); BaseIpCfg resultIpCfg=ipCfgService.get(searchIpCfg);
if(resultIpCfg!=null){
searchIpCfg.setAuditorId(searchIpCfg.getCurrentUser().getId()); searchIpCfg.setAuditorId(searchIpCfg.getCurrentUser().getId());
searchIpCfg.setAuditTime(date); searchIpCfg.setAuditTime(date);
searchIpCfg.setCfgId(resultIpCfg.getCfgId()); searchIpCfg.setCfgId(resultIpCfg.getCfgId());
@@ -896,13 +897,14 @@ public class MultipleCfgController extends BaseController{
map.put(tableName, resultIpCfg); map.put(tableName, resultIpCfg);
} }
} }
}
}else if(Constants.TABLE_TYPE_STRING==type){ }else if(Constants.TABLE_TYPE_STRING==type){
BaseStringCfg searchStringCfg=new BaseStringCfg(); BaseStringCfg searchStringCfg=new BaseStringCfg();
searchStringCfg.setTableName(tableName); searchStringCfg.setTableName(tableName);
searchStringCfg.setCompileId(compileId); searchStringCfg.setCompileId(compileId);
//根据表名，编译ID查询唯一结果 //根据表名，编译ID查询唯一结果
BaseStringCfg resultStringCfg=stringCfgService.get(searchStringCfg); BaseStringCfg resultStringCfg=stringCfgService.get(searchStringCfg);
if(resultStringCfg!=null){
searchStringCfg.setAuditorId(searchStringCfg.getCurrentUser().getId()); searchStringCfg.setAuditorId(searchStringCfg.getCurrentUser().getId());
searchStringCfg.setAuditTime(date); searchStringCfg.setAuditTime(date);
searchStringCfg.setCfgId(resultStringCfg.getCfgId()); searchStringCfg.setCfgId(resultStringCfg.getCfgId());
@@ -940,11 +942,13 @@ public class MultipleCfgController extends BaseController{
map.put(tableName, resultStringCfg); map.put(tableName, resultStringCfg);
} }
} }
}
}else if(Constants.TABLE_TYPE_NUMBER==type){ }else if(Constants.TABLE_TYPE_NUMBER==type){
NumBoundaryCfg searchNumCfg=new NumBoundaryCfg(); NumBoundaryCfg searchNumCfg=new NumBoundaryCfg();
searchNumCfg.setTableName(tableName); searchNumCfg.setTableName(tableName);
searchNumCfg.setCompileId(compileId); searchNumCfg.setCompileId(compileId);
NumBoundaryCfg resultNumCfg=numCfgService.get(searchNumCfg); NumBoundaryCfg resultNumCfg=numCfgService.get(searchNumCfg);
if(resultNumCfg!=null){
searchNumCfg.setAuditorId(searchNumCfg.getCurrentUser().getId()); searchNumCfg.setAuditorId(searchNumCfg.getCurrentUser().getId());
searchNumCfg.setAuditTime(date); searchNumCfg.setAuditTime(date);
searchNumCfg.setCfgId(resultNumCfg.getCfgId()); searchNumCfg.setCfgId(resultNumCfg.getCfgId());
@@ -982,11 +986,13 @@ public class MultipleCfgController extends BaseController{
map.put(tableName, resultNumCfg); map.put(tableName, resultNumCfg);
} }
} }
}
}else if(Constants.TABLE_TYPE_COMPLEX==type){ }else if(Constants.TABLE_TYPE_COMPLEX==type){
ComplexkeywordCfg searchComplexCfg=new ComplexkeywordCfg(); ComplexkeywordCfg searchComplexCfg=new ComplexkeywordCfg();
searchComplexCfg.setTableName(tableName); searchComplexCfg.setTableName(tableName);
searchComplexCfg.setCompileId(compileId); searchComplexCfg.setCompileId(compileId);
ComplexkeywordCfg resultComplexCfg=complexStringCfgService.get(searchComplexCfg); ComplexkeywordCfg resultComplexCfg=complexStringCfgService.get(searchComplexCfg);
if(resultComplexCfg!=null){
searchComplexCfg.setAuditorId(searchComplexCfg.getCurrentUser().getId()); searchComplexCfg.setAuditorId(searchComplexCfg.getCurrentUser().getId());
searchComplexCfg.setAuditTime(date); searchComplexCfg.setAuditTime(date);
searchComplexCfg.setCfgId(resultComplexCfg.getCfgId()); searchComplexCfg.setCfgId(resultComplexCfg.getCfgId());
@@ -1026,6 +1032,7 @@ public class MultipleCfgController extends BaseController{
} }
} }
} }
}
boolean result=multipleCfgService.auditCfg(resultCfg,searchCfg); boolean result=multipleCfgService.auditCfg(resultCfg,searchCfg);
if(!result){ if(!result){
addMessage(model,"审核失败"); addMessage(model,"审核失败");