feat:(REQ-2300) 数据库拦截器更换上下文

This commit is contained in:
lilong 2024-06-13 17:27:15 +08:00
parent dae702747d
commit 202c577007

View File

@ -1,5 +1,6 @@
package cn.axzo.framework.datapermission.rule;
import cn.axzo.framework.datapermission.context.DataPermissionContextHolder;
import cn.axzo.framework.datapermission.context.DataPermissionPrepareContextHolder;
import cn.axzo.karma.client.feign.tyr.DataObjectApi;
import com.baomidou.mybatisplus.core.metadata.TableInfo;
@ -64,15 +65,15 @@ public class OrgDefaultRuleServiceImpl implements DataPermissionRuleService {
@Override
public Expression getExpression(String tableName, Alias tableAlias) {
DataPermissionPrepareContextHolder.DataPermissionPrepareContext dataPermissionPrepareContext = DataPermissionPrepareContextHolder.get();
DataPermissionContextHolder.DataPermissionContext dataPermissionContext = DataPermissionContextHolder.get();
if (dataPermissionPrepareContext == null) {
if (dataPermissionContext == null) {
log.warn("not found dataPermissionContext");
return EXPRESSION_NULL;
}
Set<Long> nodeIds = dataPermissionPrepareContext.getDataPermissionNodeIds();
Set<Long> personIds = dataPermissionPrepareContext.getDataPermissionPersonIds();
Set<Long> nodeIds = dataPermissionContext.getNodeIds();
Set<Long> personIds = dataPermissionContext.getPersonIds();
Expression deptExpression = buildExpression(tableName, tableAlias, nodeIds);
Expression userExpression = buildExpression(tableName, tableAlias, personIds);