opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 18:45:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !358 from 随风随飘絮/dev

Browse Source
This commit is contained in:
随风随飘絮 2023-06-02 12:18:50 +00:00 committed by Gitee
commit 9c6d3497ec
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
View File

@ -14,7 +14,6 @@ import com.ruoyi.common.enums.DataScopeType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataPermissionHelper; import com.ruoyi.common.helper.DataPermissionHelper;
import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -34,7 +33,6 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -110,7 +108,7 @@ public class PlusDataPermissionHandler {
StandardEvaluationContext context = new StandardEvaluationContext(); StandardEvaluationContext context = new StandardEvaluationContext();
context.setBeanResolver(beanResolver); context.setBeanResolver(beanResolver);
DataPermissionHelper.getContext().forEach(context::setVariable); DataPermissionHelper.getContext().forEach(context::setVariable);
Set<String> conditions = new HashSet<>(); List<String> conditions = new LinkedList<>();
for (RoleDTO role : user.getRoles()) { for (RoleDTO role : user.getRoles()) {
user.setRoleId(role.getRoleId()); user.setRoleId(role.getRoleId());
// 获取角色权限泛型 // 获取角色权限泛型
@ -150,7 +148,8 @@ public class PlusDataPermissionHandler {
} }
if (CollUtil.isNotEmpty(conditions)) { if (CollUtil.isNotEmpty(conditions)) {
String sql = StreamUtils.join(conditions, Function.identity(), ""); conditions.sort((o1, o2) -> o1.length() > o2.length() ? -1 : 1);
String sql = conditions.get(0);
return sql.substring(joinStr.length()); return sql.substring(joinStr.length());
} }
return ""; return "";