diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/annotation/DataPermission.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/annotation/DataPermission.java
deleted file mode 100644
index ff94449b..00000000
--- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/annotation/DataPermission.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.continew.admin.common.annotation;
-
-import java.lang.annotation.*;
-
-import org.springframework.core.annotation.AliasFor;
-
-/**
- * 数据权限注解
- *
- * @author Charles7c
- * @since 2023/3/6 23:34
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface DataPermission {
-
- /**
- * Alias for the {@link #tableAlias()} attribute.
- */
- @AliasFor("tableAlias")
- String value() default "";
-
- /**
- * 表别名
- */
- @AliasFor("value")
- String tableAlias() default "";
-
- /**
- * ID
- */
- String id() default "id";
-
- /**
- * 部门 ID
- */
- String deptId() default "dept_id";
-
- /**
- * 用户 ID
- */
- String userId() default "create_user";
-
- /**
- * 角色 ID（角色和部门关联表）
- */
- String roleId() default "role_id";
-
- /**
- * 部门表别名
- */
- String deptTableAlias() default "sys_dept";
-
- /**
- * 角色和部门关联表别名
- */
- String roleDeptTableAlias() default "sys_role_dept";
-}
diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java
new file mode 100644
index 00000000..01ae5430
--- /dev/null
+++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionFilterImpl.java
@@ -0,0 +1,58 @@
+/*
+ * 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.continew.admin.common.config.mybatis;
+
+import java.util.stream.Collectors;
+
+import cn.hutool.core.convert.Convert;
+
+import top.charles7c.continew.admin.common.model.dto.LoginUser;
+import top.charles7c.continew.admin.common.util.helper.LoginHelper;
+import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionCurrentUser;
+import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter;
+import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataScope;
+
+/**
+ * 数据权限过滤器实现类
+ *
+ * @author Charles7c
+ * @since 2023/12/21 21:19
+ */
+public class DataPermissionFilterImpl implements DataPermissionFilter {
+
+ @Override
+ public boolean isFilter() {
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ return null != loginUser && !loginUser.isAdmin();
+ }
+
+ @Override
+ public DataPermissionCurrentUser getCurrentUser() {
+ LoginUser loginUser = LoginHelper.getLoginUser();
+ if (null == loginUser) {
+ throw new IllegalArgumentException("Current user is not allowed to be empty.");
+ }
+ DataPermissionCurrentUser currentUser = new DataPermissionCurrentUser();
+ currentUser.setUserId(Convert.toStr(loginUser.getId()));
+ currentUser.setDeptId(Convert.toStr(loginUser.getDeptId()));
+ currentUser.setRoles(loginUser.getRoles().stream()
+ .map(r -> new DataPermissionCurrentUser.CurrentUserRole(Convert.toStr(r.getId()),
+ DataScope.valueOf(r.getDataScope().name())))
+ .collect(Collectors.toSet()));
+ return currentUser;
+ }
+}
diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionHandlerImpl.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionHandlerImpl.java
deleted file mode 100644
index 18cba798..00000000
--- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionHandlerImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * 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.continew.admin.common.config.mybatis;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-
-import lombok.extern.slf4j.Slf4j;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
-
-import top.charles7c.continew.admin.common.annotation.DataPermission;
-import top.charles7c.continew.admin.common.enums.DataScopeEnum;
-import top.charles7c.continew.admin.common.model.dto.LoginUser;
-import top.charles7c.continew.admin.common.model.dto.RoleDTO;
-import top.charles7c.continew.admin.common.util.helper.LoginHelper;
-import top.charles7c.continew.starter.core.constant.StringConstants;
-
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.Function;
-import net.sf.jsqlparser.expression.LongValue;
-import net.sf.jsqlparser.expression.Parenthesis;
-import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
-import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
-import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-import net.sf.jsqlparser.expression.operators.relational.InExpression;
-import net.sf.jsqlparser.schema.Column;
-import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.PlainSelect;
-import net.sf.jsqlparser.statement.select.SelectExpressionItem;
-import net.sf.jsqlparser.statement.select.SubSelect;
-
-/**
- * 数据权限处理器实现
- * <p>
- * 来源：<a href="https://gitee.com/baomidou/mybatis-plus/issues/I37I90">DataPermissionInterceptor 如何使用？</a>
- * </p>
- *
- * @author Charles7c
- * @since 2023/3/6 23:19
- */
-@Slf4j
-public class DataPermissionHandlerImpl implements DataPermissionHandler {
-
- @Override
- public Expression getSqlSegment(Expression where, String mappedStatementId) {
- try {
- Class<?> clazz =
- Class.forName(mappedStatementId.substring(0, mappedStatementId.lastIndexOf(StringConstants.DOT)));
- String methodName = mappedStatementId.substring(mappedStatementId.lastIndexOf(StringConstants.DOT) + 1);
- 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, where);
- }
- }
- }
- } catch (ClassNotFoundException e) {
- log.error("Data permission handler build data scope filter occurred an error: {}.", e.getMessage(), e);
- }
- return where;
- }
-
- /**
- * 构建数据范围过滤条件
- *
- * @param user
- * 当前登录用户
- * @param dataPermission
- * 数据权限
- * @param where
- * 当前查询条件
- * @return 构建后查询条件
- */
- private Expression buildDataScopeFilter(LoginUser user, DataPermission dataPermission, Expression where) {
- Expression expression = null;
- String tableAlias = dataPermission.tableAlias();
- String id = dataPermission.id();
- String deptId = dataPermission.deptId();
- for (RoleDTO role : user.getRoles()) {
- DataScopeEnum dataScope = role.getDataScope();
- if (DataScopeEnum.ALL.equals(dataScope)) {
- return where;
- }
- if (DataScopeEnum.DEPT_AND_CHILD.equals(dataScope)) {
- // select t1.* from table as t1 where t1.`dept_id` in (select `id` from `sys_dept` where `id` = xxx or
- // find_in_set(xxx, `ancestors`));
- // 构建子查询
- SubSelect subSelect = new SubSelect();
- PlainSelect select = new PlainSelect();
- select.setSelectItems(Collections.singletonList(new SelectExpressionItem(new Column(id))));
- select.setFromItem(new Table(dataPermission.deptTableAlias()));
- EqualsTo equalsTo = new EqualsTo();
- equalsTo.setLeftExpression(new Column(id));
- equalsTo.setRightExpression(new LongValue(user.getDeptId()));
- Function function = new Function();
- function.setName("find_in_set");
- function.setParameters(new ExpressionList(new LongValue(user.getDeptId()), new Column("ancestors")));
- select.setWhere(new OrExpression(equalsTo, function));
- subSelect.setSelectBody(select);
- // 构建父查询
- InExpression inExpression = new InExpression();
- inExpression.setLeftExpression(this.buildColumn(tableAlias, deptId));
- 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(this.buildColumn(tableAlias, deptId));
- 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(this.buildColumn(tableAlias, dataPermission.userId()));
- equalsTo.setRightExpression(new LongValue(user.getId()));
- expression = null != expression ? new OrExpression(expression, equalsTo) : equalsTo;
- } else if (DataScopeEnum.CUSTOM.equals(dataScope)) {
- // select t1.* from table as t1 where t1.`dept_id` in (select `dept_id` from `sys_role_dept` where
- // `role_id` = xxx);
- // 构建子查询
- SubSelect subSelect = new SubSelect();
- PlainSelect select = new PlainSelect();
- select.setSelectItems(Collections.singletonList(new SelectExpressionItem(new Column(deptId))));
- select.setFromItem(new Table(dataPermission.roleDeptTableAlias()));
- EqualsTo equalsTo = new EqualsTo();
- equalsTo.setLeftExpression(new Column(dataPermission.roleId()));
- equalsTo.setRightExpression(new LongValue(role.getId()));
- select.setWhere(equalsTo);
- subSelect.setSelectBody(select);
- // 构建父查询
- InExpression inExpression = new InExpression();
- inExpression.setLeftExpression(this.buildColumn(tableAlias, deptId));
- inExpression.setRightExpression(subSelect);
- expression = null != expression ? new OrExpression(expression, inExpression) : inExpression;
- }
- }
- return null != where ? new AndExpression(where, new Parenthesis(expression)) : expression;
- }
-
- /**
- * 构建 Column
- *
- * @param tableAlias
- * 表别名
- * @param columnName
- * 字段名称
- * @return 带表别名字段
- */
- private Column buildColumn(String tableAlias, String columnName) {
- if (StringUtils.isNotEmpty(tableAlias)) {
- columnName = String.format("%s.%s", tableAlias, columnName);
- }
- return new Column(columnName);
- }
-}
diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/base/DataPermissionMapper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java
similarity index 85%
rename from continew-admin-common/src/main/java/top/charles7c/continew/admin/common/base/DataPermissionMapper.java
rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java
index 2a5e82c4..46a2c688 100644
--- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/base/DataPermissionMapper.java
+++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionMapper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package top.charles7c.continew.admin.common.base;
+package top.charles7c.continew.admin.common.config.mybatis;
import java.util.List;
@@ -24,8 +24,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
-import top.charles7c.continew.admin.common.annotation.DataPermission;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermission;
/**
* 数据权限 Mapper 基类
diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java
index ca1c4e7f..54905749 100644
--- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java
+++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java
@@ -21,6 +21,8 @@ import org.springframework.context.annotation.Configuration;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import top.charles7c.continew.starter.data.mybatis.plus.datapermission.DataPermissionFilter;
+
/**
* MyBatis Plus 配置
*
@@ -37,4 +39,12 @@ public class MybatisPlusConfiguration {
public MetaObjectHandler metaObjectHandler() {
return new MyBatisPlusMetaObjectHandler();
}
+
+ /**
+ * 数据权限过滤器
+ */
+ @Bean
+ public DataPermissionFilter dataPermissionFilter() {
+ return new DataPermissionFilterImpl();
+ }
}
diff --git a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LogContext.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LogContext.java
deleted file mode 100644
index ec38c54d..00000000
--- a/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LogContext.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.continew.admin.common.model.dto;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import lombok.Data;
-
-/**
- * 系统日志上下文
- *
- * @author Charles7c
- * @since 2022/12/25 8:59
- */
-@Data
-public class LogContext implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 创建人
- */
- private Long createUser;
-
- /**
- * 创建时间
- */
- private LocalDateTime createTime;
-
- /**
- * 错误信息
- */
- private String errorMsg;
-
- /**
- * 异常信息
- */
- private Throwable exception;
-}
diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java
index caebbcfe..324b94f1 100644
--- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java
+++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java
@@ -25,7 +25,7 @@ import top.charles7c.continew.admin.monitor.model.entity.LogDO;
import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp;
import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 系统日志 Mapper
diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java
index 1cd08e24..27650a77 100644
--- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java
+++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java
@@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 登录日志查询条件
diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java
index 51d24a25..a60f4ac8 100644
--- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java
+++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java
@@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 操作日志查询条件
diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java
index 663755e3..3be705fb 100644
--- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java
+++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java
@@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 系统日志查询条件
diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java
index 6241716c..c3482229 100644
--- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java
+++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java
@@ -42,7 +42,7 @@ import top.charles7c.continew.admin.monitor.service.LogService;
import top.charles7c.continew.starter.core.util.ExceptionUtils;
import top.charles7c.continew.starter.core.util.ReflectUtils;
import top.charles7c.continew.starter.core.util.validate.CheckUtils;
-import top.charles7c.continew.starter.data.mybatis.plus.util.QueryHelper;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryHelper;
import top.charles7c.continew.starter.extension.crud.base.CommonUserService;
import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp;
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java
index 49f7160c..375e84f1 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/AnnouncementMapper.java
@@ -20,7 +20,7 @@ import java.util.List;
import top.charles7c.continew.admin.system.model.entity.AnnouncementDO;
import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 公告 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java
index 7081a165..b4819ebd 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DeptMapper.java
@@ -17,7 +17,7 @@
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.continew.admin.system.model.entity.DeptDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 部门 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java
index 3c22e697..97fbe27c 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictItemMapper.java
@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Param;
import top.charles7c.continew.admin.common.model.resp.LabelValueResp;
import top.charles7c.continew.admin.system.model.entity.DictItemDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 字典项 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java
index 9f10af9a..2e53650f 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/DictMapper.java
@@ -17,7 +17,7 @@
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.continew.admin.system.model.entity.DictDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 字典 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java
index 0c21ec0a..fd26c79f 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MenuMapper.java
@@ -22,7 +22,7 @@ import java.util.Set;
import org.apache.ibatis.annotations.Param;
import top.charles7c.continew.admin.system.model.entity.MenuDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 菜单 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java
index 1eaf234c..b0700bc1 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageMapper.java
@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import top.charles7c.continew.admin.system.model.entity.MessageDO;
import top.charles7c.continew.admin.system.model.resp.MessageResp;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 消息 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java
index 7327d42f..ee1b34c2 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/MessageUserMapper.java
@@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
import top.charles7c.continew.admin.system.model.entity.MessageUserDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 消息和用户 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java
index 0ed0dcf3..82171102 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/OptionMapper.java
@@ -17,7 +17,7 @@
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.continew.admin.system.model.entity.OptionDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 参数 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java
index 5a94d519..32238858 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleDeptMapper.java
@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.charles7c.continew.admin.system.model.entity.RoleDeptDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 角色和部门 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java
index 5010b773..d58c67f1 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMapper.java
@@ -17,7 +17,7 @@
package top.charles7c.continew.admin.system.mapper;
import top.charles7c.continew.admin.system.model.entity.RoleDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 角色 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java
index 38bb4f24..14a2bb80 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/RoleMenuMapper.java
@@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper;
import java.util.List;
import top.charles7c.continew.admin.system.model.entity.RoleMenuDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 角色和菜单 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java
index 67180ac2..eaab379a 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserMapper.java
@@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
-import top.charles7c.continew.admin.common.base.DataPermissionMapper;
+import top.charles7c.continew.admin.common.config.mybatis.DataPermissionMapper;
import top.charles7c.continew.admin.system.model.entity.UserDO;
/**
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java
index c2291fa8..4468082d 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserRoleMapper.java
@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.charles7c.continew.admin.system.model.entity.UserRoleDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 用户和角色 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java
index 1f2fcbea..ec7b0daa 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/mapper/UserSocialMapper.java
@@ -19,7 +19,7 @@ package top.charles7c.continew.admin.system.mapper;
import org.apache.ibatis.annotations.Param;
import top.charles7c.continew.admin.system.model.entity.UserSocialDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 用户社会化关联 Mapper
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java
index 4a5a3b89..92df7fda 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/AnnouncementQuery.java
@@ -23,8 +23,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 公告查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java
index 0426e5be..5bf0c925 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DeptQuery.java
@@ -23,8 +23,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 部门查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java
index 1b9a5ce9..d25de8ca 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictItemQuery.java
@@ -23,7 +23,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
/**
* 字典项查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java
index 4a335f35..ce3f94d4 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/DictQuery.java
@@ -23,7 +23,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
/**
* 字典查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java
index 7ff6b609..284b42e7 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java
@@ -23,8 +23,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 菜单查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java
index d5299181..1ddd2d2c 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MessageQuery.java
@@ -22,8 +22,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 消息查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java
index aa4a70e8..86aa9df1 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/OptionQuery.java
@@ -26,8 +26,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 参数查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java
index 8ce3b9fb..1ada6ff8 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/RoleQuery.java
@@ -23,7 +23,7 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
/**
* 角色查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java
index 25eed4ce..a59ddbbe 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/UserQuery.java
@@ -29,8 +29,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import cn.hutool.core.date.DatePattern;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* 用户查询条件
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java
index 3ba6dbbd..1451479f 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MessageServiceImpl.java
@@ -39,7 +39,7 @@ import top.charles7c.continew.admin.system.service.MessageService;
import top.charles7c.continew.admin.system.service.MessageUserService;
import top.charles7c.continew.starter.core.util.ExceptionUtils;
import top.charles7c.continew.starter.core.util.validate.CheckUtils;
-import top.charles7c.continew.starter.data.mybatis.plus.util.QueryHelper;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryHelper;
import top.charles7c.continew.starter.extension.crud.base.CommonUserService;
import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp;
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java
index 30cd9b6c..4abc27ce 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/OptionServiceImpl.java
@@ -34,7 +34,7 @@ import top.charles7c.continew.admin.system.model.req.OptionReq;
import top.charles7c.continew.admin.system.model.req.OptionResetValueReq;
import top.charles7c.continew.admin.system.model.resp.OptionResp;
import top.charles7c.continew.admin.system.service.OptionService;
-import top.charles7c.continew.starter.data.mybatis.plus.util.QueryHelper;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryHelper;
/**
* 参数业务实现
diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java
index 209b93cc..44d8e354 100644
--- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/FieldConfigMapper.java
@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import top.charles7c.continew.admin.tool.model.entity.FieldConfigDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 字段配置 Mapper
diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/GenConfigMapper.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/GenConfigMapper.java
index 0472dc97..1c8a9dac 100644
--- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/GenConfigMapper.java
+++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/mapper/GenConfigMapper.java
@@ -17,7 +17,7 @@
package top.charles7c.continew.admin.tool.mapper;
import top.charles7c.continew.admin.tool.model.entity.GenConfigDO;
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
/**
* 生成配置 Mapper
diff --git a/continew-admin-tool/src/main/resources/templates/generator/Mapper.ftl b/continew-admin-tool/src/main/resources/templates/generator/Mapper.ftl
index 92d5145a..6f0b5968 100644
--- a/continew-admin-tool/src/main/resources/templates/generator/Mapper.ftl
+++ b/continew-admin-tool/src/main/resources/templates/generator/Mapper.ftl
@@ -1,6 +1,6 @@
package ${packageName}.${subPackageName};
-import top.charles7c.continew.starter.extension.crud.base.BaseMapper;
+import top.charles7c.continew.starter.data.mybatis.plus.base.BaseMapper;
import ${packageName}.model.entity.${classNamePrefix}DO;
/**
diff --git a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl
index 1be09674..f0039284 100644
--- a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl
+++ b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl
@@ -16,8 +16,8 @@ import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema;
-import top.charles7c.continew.starter.data.mybatis.plus.annotation.Query;
-import top.charles7c.continew.starter.data.mybatis.plus.enums.QueryType;
+import top.charles7c.continew.starter.data.mybatis.plus.query.Query;
+import top.charles7c.continew.starter.data.mybatis.plus.query.QueryType;
/**
* ${businessName}查询条件
diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/continew-admin-webapi/src/main/resources/config/application.yml
index e26a0d53..548d890a 100644
--- a/continew-admin-webapi/src/main/resources/config/application.yml
+++ b/continew-admin-webapi/src/main/resources/config/application.yml
@@ -147,8 +147,9 @@ mybatis-plus:
enabled: true
# Mapper 接口扫描包配置
mapper-package: ${project.base-package}.**.mapper
- # 数据权限实现
- data-permission-handler-impl: top.charles7c.continew.admin.common.config.mybatis.DataPermissionHandlerImpl
+ # 数据权限配置
+ data-permission:
+ enabled: true
# 分页插件配置
pagination:
enabled: true