From a57694bdff7a642b52cdaa782296e8e8730fcef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 30 Mar 2026 15:14:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=B0=86?= =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=BB=A7=E6=89=BFMPJ=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=8C=89=E9=9C=80=E6=B1=82=E7=BB=A7=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/common/mybatis/core/mapper/BaseMapperPlus.java | 4 ++-- .../main/java/org/dromara/system/mapper/SysDeptMapper.java | 3 ++- .../main/java/org/dromara/system/mapper/SysMenuMapper.java | 3 ++- .../main/java/org/dromara/system/mapper/SysPostMapper.java | 3 ++- .../main/java/org/dromara/system/mapper/SysRoleMapper.java | 3 ++- .../main/java/org/dromara/system/mapper/SysUserMapper.java | 3 ++- .../java/org/dromara/workflow/mapper/FlwHisTaskMapper.java | 3 ++- .../main/java/org/dromara/workflow/mapper/FlwTaskMapper.java | 3 ++- .../main/java/org/dromara/workflow/mapper/FlwUserMapper.java | 3 ++- 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java index 93541188d..24557edb6 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java @@ -4,11 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.reflect.GenericTypeUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.dromara.common.core.utils.MapstructUtils; @@ -29,7 +29,7 @@ import java.util.function.Function; * @since 2021-05-13 */ @SuppressWarnings("unchecked") -public interface BaseMapperPlus extends MPJBaseMapper { +public interface BaseMapperPlus extends BaseMapper { Log log = LogFactory.getLog(BaseMapperPlus.class); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index ce62f10b1..f9dccb559 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -3,6 +3,7 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.mybatis.annotation.DataColumn; @@ -26,7 +27,7 @@ import static org.dromara.common.core.constant.SystemConstants.NORMAL; * * @author Lion Li */ -public interface SysDeptMapper extends BaseMapperPlus { +public interface SysDeptMapper extends BaseMapperPlus, MPJBaseMapper { /** * 查询部门管理数据 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java index 50a82218b..a587b087a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java @@ -2,6 +2,7 @@ package org.dromara.system.mapper; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.utils.StreamUtils; @@ -22,7 +23,7 @@ import java.util.*; * * @author Lion Li */ -public interface SysMenuMapper extends BaseMapperPlus { +public interface SysMenuMapper extends BaseMapperPlus, MPJBaseMapper { /** * 根据用户ID查询权限 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java index 3b27cd961..8e740e0a4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java @@ -3,6 +3,7 @@ package org.dromara.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; @@ -19,7 +20,7 @@ import java.util.List; * * @author Lion Li */ -public interface SysPostMapper extends BaseMapperPlus { +public interface SysPostMapper extends BaseMapperPlus, MPJBaseMapper { /** * 分页查询岗位列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java index a48310441..96d127a7a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.annotation.DataColumn; @@ -21,7 +22,7 @@ import java.util.List; * * @author Lion Li */ -public interface SysRoleMapper extends BaseMapperPlus { +public interface SysRoleMapper extends BaseMapperPlus, MPJBaseMapper { /** * 分页查询角色列表 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 2d2620233..3d2f6b144 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Param; @@ -27,7 +28,7 @@ import java.util.List; * * @author Lion Li */ -public interface SysUserMapper extends BaseMapperPlus { +public interface SysUserMapper extends BaseMapperPlus, MPJBaseMapper { /** * 分页查询用户列表，并进行数据权限控制 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java index 4250b70a0..594d0903c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwHisTaskMapper.java @@ -2,6 +2,7 @@ package org.dromara.workflow.mapper; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.dromara.common.core.utils.StringUtils; @@ -25,7 +26,7 @@ import static org.dromara.workflow.common.constant.FlowConstant.NOT_DELETED; * @author may * @date 2024-03-02 */ -public interface FlwHisTaskMapper extends BaseMapperPlus { +public interface FlwHisTaskMapper extends BaseMapperPlus, MPJBaseMapper { default Page getListFinishTask(Page page, FlowTaskBo bo, List categoryIds, String userId) { Map params = bo.getParams(); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java index 266eb310f..bb8ab4744 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java @@ -2,6 +2,7 @@ package org.dromara.workflow.mapper; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.dromara.common.core.enums.BusinessStatusEnum; @@ -24,7 +25,7 @@ import static org.dromara.workflow.common.constant.FlowConstant.NOT_DELETED; * @author may * @date 2024-03-02 */ -public interface FlwTaskMapper extends BaseMapperPlus { +public interface FlwTaskMapper extends BaseMapperPlus, MPJBaseMapper { default Page getListRunTask(Page page, FlowTaskBo bo, List categoryIds, String userId) { Map params = bo.getParams(); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwUserMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwUserMapper.java index 60b9e3c2c..a10f55fe8 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwUserMapper.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwUserMapper.java @@ -2,6 +2,7 @@ package org.dromara.workflow.mapper; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.dromara.common.core.enums.BusinessStatusEnum; @@ -24,7 +25,7 @@ import static org.dromara.workflow.common.constant.FlowConstant.NOT_DELETED; * @author may * @date 2024-03-02 */ -public interface FlwUserMapper extends BaseMapperPlus { +public interface FlwUserMapper extends BaseMapperPlus, MPJBaseMapper { default Page getListRunTask(Page page, FlowTaskBo bo, List categoryIds, String userId) { Map params = bo.getParams();