admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-24 14:58:41 +08:00
parent 7ecc95cebe
commit b18a660601
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/zhgd/mybatis/DataScopeHandler.java
View File

@ -198,24 +198,6 @@ public class DataScopeHandler implements DataPermissionHandler {
} }
} }
if (!DataScopeInterceptor.isNotSqlTest()) {
String sql = " ('1qqq')";
try {
Expression expression = CCJSqlParserUtil.parseCondExpression(sql);
Expression where = plainSelect.getWhere();
if (where != null) {
where = new AndExpression(where, expression);
} else {
where = expression;
}
plainSelect.setWhere(where);
} catch (JSQLParserException e) {
throw new RuntimeException(e);
}
}
if (expressions.size() > 0) { if (expressions.size() > 0) {
Expression dataExpression; Expression dataExpression;
if (expressions.size() > 1) { if (expressions.size() > 1) {
@ -240,6 +222,23 @@ public class DataScopeHandler implements DataPermissionHandler {
} }
if (!DataScopeInterceptor.isNotSqlTest()) {
String sql = " ('1qqq')";
try {
Expression expression = CCJSqlParserUtil.parseCondExpression(sql);
Expression where = plainSelect.getWhere();
if (where != null) {
where = new AndExpression(where, expression);
} else {
where = expression;
}
plainSelect.setWhere(where);
} catch (JSQLParserException e) {
throw new RuntimeException(e);
}
}
//List<String> scopeIds = systemUserDataScopeService.list(Wrappers.<SystemUserDataScope>lambdaQuery().eq(SystemUserDataScope::getUserId, user.getUserId())) //List<String> scopeIds = systemUserDataScopeService.list(Wrappers.<SystemUserDataScope>lambdaQuery().eq(SystemUserDataScope::getUserId, user.getUserId()))
// .stream().map(u -> u.getRelevanceId()).collect(Collectors.toList()); // .stream().map(u -> u.getRelevanceId()).collect(Collectors.toList());
//if (user.getAccountType() == 4) { //if (user.getAccountType() == 4) {