BJ_ZTEITS-Developers / parking-cloud-yudao

Commit cfcf0dc1075994df2d824a1f28b5985a19ad910b

Authored by YunaiV
1 parent 65205144

fix：【framework】数据权限的单测报错问题

Inline Side-by-side
Showing 2 changed files with 1 additions and 5 deletions
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java
  View file @cfcf0dc
@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; @@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
19 import net.sf.jsqlparser.expression.Alias; 19 import net.sf.jsqlparser.expression.Alias;
20 import net.sf.jsqlparser.expression.Expression; 20 import net.sf.jsqlparser.expression.Expression;
21 import net.sf.jsqlparser.expression.LongValue; 21 import net.sf.jsqlparser.expression.LongValue;
22 -import net.sf.jsqlparser.expression.NullValue;  
23 import net.sf.jsqlparser.expression.operators.conditional.OrExpression; 22 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
24 import net.sf.jsqlparser.expression.operators.relational.EqualsTo; 23 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
25 import net.sf.jsqlparser.expression.operators.relational.ExpressionList; 24 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
@@ -60,8 +59,6 @@ public class DeptDataPermissionRule implements DataPermissionRule { @@ -60,8 +59,6 @@ public class DeptDataPermissionRule implements DataPermissionRule {
60 private static final String DEPT_COLUMN_NAME = "dept_id"; 59 private static final String DEPT_COLUMN_NAME = "dept_id";
61 private static final String USER_COLUMN_NAME = "user_id"; 60 private static final String USER_COLUMN_NAME = "user_id";
62 61
63 - static final Expression EXPRESSION_NULL = new NullValue();  
64 -  
65 private final PermissionCommonApi permissionApi; 62 private final PermissionCommonApi permissionApi;
66 63
67 /** 64 /**
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/test/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleTest.java
  View file @cfcf0dc
@@ -19,7 +19,6 @@ import org.mockito.MockedStatic; @@ -19,7 +19,6 @@ import org.mockito.MockedStatic;
19 19
20 import java.util.Map; 20 import java.util.Map;
21 21
22 -import static cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRule.EXPRESSION_NULL;  
23 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; 22 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
24 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; 23 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
25 import static org.junit.jupiter.api.Assertions.*; 24 import static org.junit.jupiter.api.Assertions.*;
@@ -150,7 +149,7 @@ class DeptDataPermissionRuleTest extends BaseMockitoUnitTest { @@ -150,7 +149,7 @@ class DeptDataPermissionRuleTest extends BaseMockitoUnitTest {
150 // 调用 149 // 调用
151 Expression expression = rule.getExpression(tableName, tableAlias); 150 Expression expression = rule.getExpression(tableName, tableAlias);
152 // 断言 151 // 断言
153 - assertSame(EXPRESSION_NULL, expression); 152 + assertEquals("null = null", expression.toString());
154 assertSame(deptDataPermission, loginUser.getContext(DeptDataPermissionRule.CONTEXT_KEY, DeptDataPermissionRespDTO.class)); 153 assertSame(deptDataPermission, loginUser.getContext(DeptDataPermissionRule.CONTEXT_KEY, DeptDataPermissionRespDTO.class));
155 } 154 }
156 } 155 }