Merge remote-tracking branch 'origin/satoken' into dev

疯狂的狮子li

2022-01-13 6ca853516671882e8e54d9630a4299f12fbcf9aa

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

@@ -4,9 +4,8 @@
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.LoginUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import org.aspectj.lang.JoinPoint;
@@ -18,9 +17,11 @@
 * 数据过滤处理
 *
 * @author Lion Li
 * @deprecated 3.6.0 移除 {@link com.ruoyi.framework.handler.PlusDataPermissionHandler}
 */
@Aspect
@Component
@Deprecated
public class DataScopeAspect {

   /**
@@ -61,14 +62,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 = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId());
      // 如果是超级管理员，则不过滤数据
      if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) {
         dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
            controllerDataScope.userAlias(), controllerDataScope.isUser());
      }
   }