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

审核修正同一个业务中既有maat又有callback的情况下，审核走maat的bug

Browse Source
This commit is contained in:
wangxin
2018-07-09 09:31:07 +08:00
parent 270a8c491d
commit 0d08a1cceb
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -161,27 +161,18 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId()); List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
int maatType=0; int maatType=0;
//判断下发类型是走maat还是callback //判断下发类型是走maat还是callback
if(cfg.getCfgRegionCode()!=null){
for(FunctionRegionDict f:dictList){ List<SysDataDictionaryItem> maatServiceList = DictUtils.getDictList("MAAT_SERVICE");
if(f.getConfigRegionCode().intValue()==cfg.getCfgRegionCode()){ for(SysDataDictionaryItem maatService:maatServiceList){
maatType=f.getIsMaat(); if(Integer.parseInt(maatService.getItemCode())==cfg.getServiceId().intValue()){
break; for(FunctionRegionDict f:dictList){
} if(maatService.getItemValue().equals(f.getConfigRegionValue())){
} maatType=f.getIsMaat();
}else{ break;
List<SysDataDictionaryItem> maatServiceList = DictUtils.getDictList("MAAT_SERVICE");
for(SysDataDictionaryItem maatService:maatServiceList){
if(Integer.parseInt(maatService.getItemCode())==cfg.getServiceId().intValue()){
for(FunctionRegionDict f:dictList){
if(maatService.getItemValue().equals(f.getConfigRegionValue())){
maatType=f.getIsMaat();
break;
}
} }
break;
} }
break;
} }
} }
if(cfg.getIsAudit()==Constants.AUDIT_YES){ if(cfg.getIsAudit()==Constants.AUDIT_YES){