From 68a5a01fe44a6efbe3c6e1542d853b025903cbd6 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Fri, 13 Jul 2018 19:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=AD=96=E7=95=A5=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20=E5=A2=9E=E5=8A=A0show=20more=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=20zh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml | 2 +-
 src/main/resources/messages/message_en.properties           | 6 +++---
 src/main/resources/messages/message_ru.properties           | 3 ++-
 src/main/resources/messages/message_zh_CN.properties        | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
index 21707072b..8a358dd1a 100644
--- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
@@ -47,7 +47,7 @@
 	    		AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
 	    	</if>
 	    	<!-- 数据范围过滤 -->
-			${sqlMap.dsf}
+			<!-- ${sqlMap.dsf} -->
 	    </trim>
 	    <choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 1d4d0a2c6..cc8187761 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -328,7 +328,7 @@ attribute=Attribute
 area=Area
 isp=ISP
 scope=Feature Scope
-valid_identifier=Effective Identification
+valid_identifier=Effective State
 is_audit=Confirmation State
 creator=Creator
 config_time=Create Time
@@ -359,8 +359,8 @@ block_url=Block Url
 configuration=Configuration
 direction=Direction
 protocol=Protocol
-oneway=single
-twoway=two-way
+oneway=Single
+twoway=Two-way
 arbitrary=Arbitrarily
 basic_config=Basic Configuration
 block_config=Configuration Info
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index b80103dec..e3a56247d 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -836,4 +836,5 @@ lwhh_report=request info report
 src_ip_report=domestic source IP report
 dest_ip_report=destination country IP report
 isp_report=isp report
-#=============about report===================
\ No newline at end of file
+#=============about report===================
+show_more=Show More
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 3c76bd7d7..6671f00f6 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1039,4 +1039,5 @@ lwhh_report=\u6765\u6587\u51FD\u53F7\u62A5\u8868
 src_ip_report=\u5883\u5185\u6E90IP\u62A5\u8868
 dest_ip_report=\u76EE\u7684\u56FD\u5BB6IP\u62A5\u8868
 isp_report=\u8FD0\u8425\u5546\u5C40\u70B9\u62A5\u8868
-#=============about report===================
\ No newline at end of file
+#=============about report===================
+show_more=\u5C55\u793A\u66F4\u591A
\ No newline at end of file