From 3640847909ccb5b3a9918791f3869ec73e05dff9 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Tue, 22 May 2018 19:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9voipList=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=AD=20=E5=A4=9A=E4=B8=AA=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=94=A8=3D=E5=8F=B7=E7=9A=84bug=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E4=B8=BAin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AvContentCfgDao.xml   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
index d72d95f62..b1448f437 100644
--- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
@@ -198,11 +198,11 @@
 	    	<if test="cfg.functionId != null">
 	    		AND a.function_id=#{cfg.functionId,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="(cfg.voipIp.srcIpAddress != null and (cfg.voipIp.srcIpAddress != '') or cfg.voipIp.srcPort != null and cfg.voipIp.srcPort != '')">
-	    		AND a.compile_id = (select t.compile_id from av_voip_ip_cfg t 
+	    	<if test="(cfg.voipIp.srcIpAddress != null and cfg.voipIp.srcIpAddress != '') or (cfg.voipIp.srcPort != null and cfg.voipIp.srcPort != '')">
+	    		AND a.compile_id in (select t.compile_id from av_voip_ip_cfg t 
 	    		<where>
-	    			<if test="cfg.voipIp.ipAddress != null and cfg.voipIp.ipAddress != ''">
-	    				and  t.src_ip_address =#{(cfg.voipIp.srcIpAddress,jdbcType=VARCHAR}
+	    			<if test="cfg.voipIp.srcIpAddress != null and cfg.voipIp.srcIpAddress != ''">
+	    				and  t.src_ip_address =#{cfg.voipIp.srcIpAddress,jdbcType=VARCHAR}
 		    		</if>
 		    		<if test="cfg.voipIp.srcPort != null  and cfg.voipIp.srcPort != ''">
 		    			and  t.src_port =#{cfg.voipIp.srcPort,jdbcType=VARCHAR}
@@ -211,7 +211,7 @@
 	    		 )
 	    	</if>
 	    	<if test="(cfg.voipAccount.cfgKeywords != null and cfg.voipAccount.cfgKeywords != '') or (cfg.voipAccount.district != null and cfg.voipAccount.district != '') ">
-	    		AND a.compile_id = (select f.compile_id from av_voip_account_cfg f
+	    		AND a.compile_id in (select f.compile_id from av_voip_account_cfg f
 	    		<where>
 	    			<if test="cfg.voipAccount.cfgKeywords != null and cfg.voipAccount.cfgKeywords != ''">
 	    				and  f.cfg_keywords  like concat(concat('%',#{cfg.voipAccount.cfgKeywords,jdbcType=VARCHAR}),'%')
@@ -219,6 +219,9 @@
 		    		<if test="cfg.voipAccount.district != null and cfg.voipAccount.district != ''">
 		    			and  f.district =#{cfg.voipAccount.district,jdbcType=VARCHAR}
 		    		</if>
+		    		<if test="cfg.compileId != null">
+		    			and  f.compile_id =#{cfg.compileId,jdbcType=INTEGER}
+		    		</if>
 	    		</where>
 	    		 )
 	    	</if>