From 0b6aaa3f9eea4e77451fa123f51b71ce53d0c2fe Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 21 Aug 2018 10:06:43 +0800
Subject: [PATCH] =?UTF-8?q?function=5Fregion=5Fdict=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0config=5Fregion=5Fsort=E5=88=97?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E6=8D=AEconfig=5Fregion=5Fsort=E5=88=97?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/FunctionRegionDict.java    | 7 +++++++
 src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/domain/FunctionRegionDict.java b/src/main/java/com/nis/domain/FunctionRegionDict.java
index 130984d68..613daeaf6 100644
--- a/src/main/java/com/nis/domain/FunctionRegionDict.java
+++ b/src/main/java/com/nis/domain/FunctionRegionDict.java
@@ -27,7 +27,14 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	private String configPortPattern;
 	private String configDirection;
 	private String configProtocol;
+	private Integer configRegionSort;
 	
+	public Integer getConfigRegionSort() {
+		return configRegionSort;
+	}
+	public void setConfigRegionSort(Integer configRegionSort) {
+		this.configRegionSort = configRegionSort;
+	}
 	public String getConfigIpPortShow() {
 		return configIpPortShow;
 	}
diff --git a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
index 14d58a585..f4e0ac4f0 100644
--- a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
+++ b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
@@ -22,12 +22,13 @@
     <result column="config_port_pattern" property="configPortPattern" jdbcType="VARCHAR" />
     <result column="config_direction" property="configDirection" jdbcType="VARCHAR" />
     <result column="config_protocol" property="configProtocol" jdbcType="VARCHAR" />
+    <result column="config_region_sort" property="configRegionSort" jdbcType="INTEGER" />
   </resultMap>
   
   <sql id="Base_Column_List" >
     dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type
     ,config_multi_keywords,config_hex,config_expr_type,config_match_method,config_service_type,config_ip_port_show,config_ip_type,
-    config_ip_pattern,config_port_pattern,config_direction,config_protocol
+    config_ip_pattern,config_port_pattern,config_direction,config_protocol,config_region_sort
   </sql>
   <select id="getList" resultMap="BaseResultMap"  >
     select 
@@ -43,7 +44,10 @@
    	<if test="configRegionCode != null">
    		AND config_region_code=#{configRegionCode,jdbcType=VARCHAR}
    	</if>
-   	order by dict_id,config_region_code
+   	<if test="configRegionSort != null">
+   		AND config_region_sort=#{configRegionSort,jdbcType=VARCHAR}
+   	</if>
+   	order by dict_id,config_region_sort
   </select>
  
 </mapper>
\ No newline at end of file