update [重磅更新] 登录流程升级 支持缓存

疯狂的狮子li

2021-12-03 e763381186c3a1f74ed416ea79767ac73b984745

 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -4,12 +4,9 @@
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -64,14 +61,11 @@

   protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
      // 获取当前的用户
      LoginUser loginUser = SecurityUtils.getLoginUser();
      if (StringUtils.isNotNull(loginUser)) {
         SysUser currentUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId());
            // 如果是超级管理员，则不过滤数据
         if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
            dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
               controllerDataScope.userAlias(), controllerDataScope.isUser());
         }
      SysUser currentUser = SecurityUtils.getUser();
      // 如果是超级管理员，则不过滤数据
      if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
         dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
            controllerDataScope.userAlias(), controllerDataScope.isUser());
      }
   }