地址池配置取消后新增同名配置bug修改.

src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml

@@ -1091,7 +1091,7 @@
 	    		AND a.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="cfdsLevel != null">
-	   			AND (a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER} OR a.CFDS_LEVEL=${cfdsLevel/10})
+	   			AND a.CFDS_LEVEL=#{cfdsLevel,jdbcType=INTEGER}
 	   		</if>
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}

src/main/java/com/nis/web/dao/configuration/IpAddrPoolCfgDao.xml

@@ -475,7 +475,7 @@
 		FROM 
 			ip_reuse_addr_pool r 
 		WHERE 
-			r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1
+			r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1 AND r.is_audit != 3
 	</select>
 	
 	<select id="checkAddrPoolIp" resultType="com.nis.domain.basics.IpReuseIpCfg">