地址池IP校验修改.

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

@@ -35,7 +35,7 @@ public interface IpAddrPoolCfgDao extends CrudDao<IpAddrPoolCfgDao>{
 
 	Long getAddrPoolIdByName(String addrPoolName);
 
-	Long checkAddrPoolIp(@Param("srcIpAddress")String ip);
+	IpReuseIpCfg checkAddrPoolIp(@Param("srcIpAddress")String ip);
 
 
 

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

@@ -478,12 +478,15 @@
 			r.addr_pool_name = #{addrPoolName} AND r.is_valid != -1
 	</select>
 	
-	<select id="checkAddrPoolIp" resultType="java.lang.Long">
+	<select id="checkAddrPoolIp" resultType="com.nis.domain.basics.IpReuseIpCfg">
 		SELECT
-			r.cfg_id
+			r.cfg_id,r.src_ip_address
 		FROM 
 			ip_reuse_ip_cfg r 
 		WHERE 
-			r.src_ip_address = #{srcIpAddress} AND r.is_valid != -1 AND r.is_audit != 3
+			r.src_ip_address = #{srcIpAddress} AND 
+			r.is_valid != -1 AND 
+			r.is_audit != 3 AND
+			r.user_region1 IS NOT NULL
 	</select>
 </mapper>