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 @@ AND a.function_id=#{cfg.functionId,jdbcType=INTEGER} - - AND a.compile_id = (select t.compile_id from av_voip_ip_cfg t + + AND a.compile_id in (select t.compile_id from av_voip_ip_cfg t - - and t.src_ip_address =#{(cfg.voipIp.srcIpAddress,jdbcType=VARCHAR} + + and t.src_ip_address =#{cfg.voipIp.srcIpAddress,jdbcType=VARCHAR} and t.src_port =#{cfg.voipIp.srcPort,jdbcType=VARCHAR} @@ -211,7 +211,7 @@ ) - 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 and f.cfg_keywords like concat(concat('%',#{cfg.voipAccount.cfgKeywords,jdbcType=VARCHAR}),'%') @@ -219,6 +219,9 @@ and f.district =#{cfg.voipAccount.district,jdbcType=VARCHAR} + + and f.compile_id =#{cfg.compileId,jdbcType=INTEGER} + )