DNS reject增加策略分组功能

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

@@ -60,7 +60,10 @@
 		left join sys_user e on r.editor_id=e.id
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
-    	<where>
+    	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+    		<if test="page !=null and page.where != null and page.where != ''">
+				 AND ${page.where}
+			</if>
     		<if test="cfgId != null">
     			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
     		</if>
@@ -163,14 +166,25 @@
 	    	<if test="functionId != null">
 	    		AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
 	    	</if>
-    	</where>
+    		
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY r.CFG_ID desc
+			</otherwise>
+		</choose>
     </select>
     
     <select id="getDnsIpCfg" resultMap="dnsIpCfgMap">
     	select 
-    		<include refid="columns"></include>,
-    	from dns_ip_cfg dic
-    	where dic.cfg_id=#{cfgId}
+    		<include refid="columns"></include>
+    	from dns_ip_cfg r
+    	where r.cfg_id=#{cfgId}
     </select>
     
   <insert id="insert" parameterType="com.nis.domain.configuration.DnsIpCfg" >