From e0ba2ba3c5f7ad3f289c6ad9278023d7f9e46f66 Mon Sep 17 00:00:00 2001
From: 心悦李国楠 <332435948@qq.com>
Date: Fri, 03 Jul 2020 14:24:33 +0800
Subject: [PATCH] RedisCache中所有方法参数添加final,并优化list取出效率,添加其它常用redis方法

---
 ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
index 8567e0d..b03674c 100644
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
@@ -51,6 +51,11 @@
      */
     public static final String DATA_SCOPE_SELF = "5";
 
+    /**
+     * 数据权限过滤关键字
+     */
+    public static final String DATA_SCOPE = "dataScope";
+
     @Autowired
     private AwaitUserService awaitUserService;
 
@@ -93,7 +98,8 @@
      * 
      * @param joinPoint 切点
      * @param user 用户
-     * @param alias 别名
+     * @param deptAlias 部门别名
+     * @param userAlias 用户别名
      */
     public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
     {
@@ -140,7 +146,7 @@
         if (StringUtils.isNotBlank(sqlString.toString()))
         {
             BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];
-            baseEntity.setDataScope(" AND (" + sqlString.substring(4) + ")");
+            baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
         }
     }
 

--
Gitblit v1.9.3