From 7248fff6a52572e839e10a122d80ac8663b88bc6 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 13 Jul 2018 17:11:15 +0800
Subject: [PATCH] =?UTF-8?q?APP=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D;Xmpp=E6=B3=A8=E9=87=8A=E6=8E=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ntc/XmppController.java         |  2 +-
 .../com/nis/web/dao/configuration/AppCfgDao.xml   | 15 +++++++++++----
 .../web/service/configuration/AppCfgService.java  | 10 +++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java b/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java
index 428cdebf4..ce6a23cf8 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/XmppController.java
@@ -42,7 +42,7 @@ import com.nis.web.security.UserUtils;
 @RequestMapping("${adminPath}/ntc/other")
 public class XmppController extends BaseController {
 	@RequestMapping(value = {"xmppList"})
-	@RequiresPermissions(value={"other:xmpp:config","other:xmpp:confirm"},logical=Logical.OR)
+	//@RequiresPermissions(value={"other:xmpp:config","other:xmpp:confirm"},logical=Logical.OR)
 	public String list(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
 		Page<CfgIndexInfo> page = xmppCfgService.getXmppList(searchPage, cfg);
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 9c6f412e7..f5f63912b 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -459,7 +459,9 @@
 		    		</if>
 	    		</where>
 	    		 )
-	    	</if>	
+	    	</if>
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}	
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -580,7 +582,8 @@
 	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
 	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
 	    	</if>
-		  		
+		  	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}	
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -680,7 +683,8 @@
 	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
 	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
 	    	</if>
-		  		
+		  	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}	
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -776,7 +780,8 @@
 	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
 	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
 	    	</if>
-		  		
+		  	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}	
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -872,6 +877,8 @@
 	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
 	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
 	    	</if>
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index 02308aaa9..11718b5c8 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -50,35 +50,35 @@ public class AppCfgService extends BaseService {
 	protected AreaIpCfgDao areaIpCfgDao;
 	
 	public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
-		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
 		page.setList(list);
 		return page;
 	}
 	public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) {
-		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
 		page.setList(list);
 		return page;
 	}
 	public Page<AppHttpCfg> findAppHttpList(Page<AppHttpCfg> page, AppHttpCfg entity) {
-		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<AppHttpCfg> list = appCfgDao.findAppHttpList(entity);
 		page.setList(list);
 		return page;
 	}
 	public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) {
-		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
 		page.setList(list);
 		return page;
 	}
 	public Page<AppByteCfg> findAppByteList(Page<AppByteCfg> page, AppByteCfg entity) {
-		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<AppByteCfg> list = appCfgDao.findAppByteList(entity);
 		page.setList(list);