From 0d08a1cceb7e8148cc36d68a6cd4f871ab666321 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 9 Jul 2018 09:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BF=AE=E6=AD=A3=E5=90=8C?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=B8=9A=E5=8A=A1=E4=B8=AD=E6=97=A2=E6=9C=89?=
 =?UTF-8?q?maat=E5=8F=88=E6=9C=89callback=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E5=AE=A1=E6=A0=B8=E8=B5=B0maat=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/IpCfgService.java   | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 577c14546..85b0486e7 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -161,27 +161,18 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		List<FunctionRegionDict> dictList =  DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
 		int maatType=0;
 		//判断下发类型是走maat还是callback
-		if(cfg.getCfgRegionCode()!=null){
-			for(FunctionRegionDict f:dictList){
-				if(f.getConfigRegionCode().intValue()==cfg.getCfgRegionCode()){
-					maatType=f.getIsMaat();
-					break;
-				}
-			}
-		}else{
-			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;
-						}
+		
+		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){