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 searchPage=new Page(request,response,"a"); Page 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 @@ ) - + + + ${sqlMap.dsf} @@ -580,7 +582,8 @@ AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%') - + + ${sqlMap.dsf} @@ -680,7 +683,8 @@ AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%') - + + ${sqlMap.dsf} @@ -776,7 +780,8 @@ AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%') - + + ${sqlMap.dsf} @@ -872,6 +877,8 @@ AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%') + + ${sqlMap.dsf} 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 findAppPolicyList(Page page, AppPolicyCfg entity) { - entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.setPage(page); List list = appCfgDao.findAppPolicyList(entity); page.setList(list); return page; } public Page findAppIpList(Page page, AppIpCfg entity) { - entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.setPage(page); List list = appCfgDao.findAppIpList(entity); page.setList(list); return page; } public Page findAppHttpList(Page page, AppHttpCfg entity) { - entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.setPage(page); List list = appCfgDao.findAppHttpList(entity); page.setList(list); return page; } public Page findAppDomainList(Page page, AppDomainCfg entity) { - entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.setPage(page); List list = appCfgDao.findAppDomainList(entity); page.setList(list); return page; } public Page findAppByteList(Page page, AppByteCfg entity) { - entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a")); + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); entity.setPage(page); List list = appCfgDao.findAppByteList(entity); page.setList(list);