diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index cfd039fb5..b5434f3b7 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -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) { Expression dataExpression; 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 scopeIds = systemUserDataScopeService.list(Wrappers.lambdaQuery().eq(SystemUserDataScope::getUserId, user.getUserId())) // .stream().map(u -> u.getRelevanceId()).collect(Collectors.toList()); //if (user.getAccountType() == 4) {