疯狂的狮子Li
2021-12-09 da247c61b715dafaba58e8dd4f106f0954f6cbf4
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -4,7 +4,6 @@
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.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils;
@@ -62,14 +61,11 @@
   protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) {
      // 获取当前的用户
      LoginUser loginUser = SecurityUtils.getLoginUser();
      if (StringUtils.isNotNull(loginUser)) {
         SysUser currentUser = loginUser.getUser();
         // 如果是超级管理员,则不过滤数据
         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());
      }
   }