ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-09 04:57:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 升级 MyBatis Plus 3.5.3.1 => 3.5.3.2，并优化数据权限处理

Browse Source 
1.解决升级到 MyBatis Plus 3.5.3.2 后，由于 BaseMapper 接口变化导致部分数据权限处理报 Invalid bound statement (not found) 错误的问题（处理思路来源于：https://github.com/baomidou/mybatis-plus/issues/5630）
2.提取 DataPermissionMapper（数据权限 Mapper 基类），如需处理通用 Mapper 方法的数据权限，继承该 Mapper 即可
This commit is contained in:
Charles7c
2023-09-04 22:18:28 +08:00
parent c6ae5db826
commit 32904b54ef
5 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/DataPermissionMapper.java Normal file
View File

@@ -0,0 +1,46 @@
/*
* Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package top.charles7c.cnadmin.common.base;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import top.charles7c.cnadmin.common.annotation.DataPermission;
/**
* 数据权限 Mapper 基类
*
* @param <T>
* 实体类
* @author Charles7c
* @since 2023/9/3 21:50
*/
public interface DataPermissionMapper<T> extends BaseMapper<T> {
@Override
@DataPermission
List<T> selectList(@Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
@Override
@DataPermission
List<T> selectList(IPage<T> page, @Param(Constants.WRAPPER) Wrapper<T> queryWrapper);
}

17
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java
View File

@@ -77,12 +77,11 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
Class<?> clazz =
Class.forName(mappedStatementId.substring(0, mappedStatementId.lastIndexOf(StringConsts.DOT)));
String methodName = mappedStatementId.substring(mappedStatementId.lastIndexOf(StringConsts.DOT) + 1);
Method[] methods = clazz.getDeclaredMethods();
for (Method method : methods) {
Method[] methodArr = clazz.getMethods();
for (Method method : methodArr) {
DataPermission dataPermission = method.getAnnotation(DataPermission.class);
if (null != dataPermission
&& (method.getName().equals(methodName) || (method.getName() + "_COUNT").equals(methodName))) {
// 获取当前登录用户
LoginUser loginUser = LoginHelper.getLoginUser();
if (null != loginUser && !loginUser.isAdmin()) {
return buildDataScopeFilter(loginUser, dataPermission.value(), where);
@@ -106,7 +105,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
* 当前查询条件
* @return 构建后查询条件
*/
private static Expression buildDataScopeFilter(LoginUser user, String tableAlias, Expression where) {
private Expression buildDataScopeFilter(LoginUser user, String tableAlias, Expression where) {
Expression expression = null;
for (RoleDTO role : user.getRoles()) {
DataScopeEnum dataScope = role.getDataScope();
@@ -131,19 +130,19 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
subSelect.setSelectBody(select);
// 构建父查询
InExpression inExpression = new InExpression();
inExpression.setLeftExpression(buildColumn(tableAlias, DEPT_ID));
inExpression.setLeftExpression(this.buildColumn(tableAlias, DEPT_ID));
inExpression.setRightExpression(subSelect);
expression = null != expression ? new OrExpression(expression, inExpression) : inExpression;
} else if (DataScopeEnum.DEPT.equals(dataScope)) {
// select t1.* from table as t1 where t1.`dept_id` = xxx;
EqualsTo equalsTo = new EqualsTo();
equalsTo.setLeftExpression(buildColumn(tableAlias, DEPT_ID));
equalsTo.setLeftExpression(this.buildColumn(tableAlias, DEPT_ID));
equalsTo.setRightExpression(new LongValue(user.getDeptId()));
expression = null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
} else if (DataScopeEnum.SELF.equals(dataScope)) {
// select t1.* from table as t1 where t1.`create_user` = xxx;
EqualsTo equalsTo = new EqualsTo();
equalsTo.setLeftExpression(buildColumn(tableAlias, CREATE_USER));
equalsTo.setLeftExpression(this.buildColumn(tableAlias, CREATE_USER));
equalsTo.setRightExpression(new LongValue(user.getId()));
expression = null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
} else if (DataScopeEnum.CUSTOM.equals(dataScope)) {
@@ -161,7 +160,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
subSelect.setSelectBody(select);
// 构建父查询
InExpression inExpression = new InExpression();
inExpression.setLeftExpression(buildColumn(tableAlias, DEPT_ID));
inExpression.setLeftExpression(this.buildColumn(tableAlias, DEPT_ID));
inExpression.setRightExpression(subSelect);
expression = null != expression ? new OrExpression(expression, inExpression) : inExpression;
}
@@ -178,7 +177,7 @@ public class DataPermissionHandlerImpl implements DataPermissionHandler {
* 字段名称
* @return 带表别名字段
*/
private static Column buildColumn(String tableAlias, String columnName) {
private Column buildColumn(String tableAlias, String columnName) {
if (StringUtils.isNotEmpty(tableAlias)) {
columnName = String.format("%s.%s", tableAlias, columnName);
}