From 4a47e4b93f62b5e636ac0e76f3e4ee98e2b83154 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 02 八月 2024 08:32:55 +0800 Subject: [PATCH] 1、全局配置文件修改 2、工作流bpm功能修改 --- iailab-framework/iailab-common-mybatis/src/main/java/com/iailab/framework/mybatis/core/mapper/BaseMapperX.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iailab-framework/iailab-common-mybatis/src/main/java/com/iailab/framework/mybatis/core/mapper/BaseMapperX.java b/iailab-framework/iailab-common-mybatis/src/main/java/com/iailab/framework/mybatis/core/mapper/BaseMapperX.java index a141b97..b8ae784 100644 --- a/iailab-framework/iailab-common-mybatis/src/main/java/com/iailab/framework/mybatis/core/mapper/BaseMapperX.java +++ b/iailab-framework/iailab-common-mybatis/src/main/java/com/iailab/framework/mybatis/core/mapper/BaseMapperX.java @@ -56,7 +56,7 @@ default <D> PageResult<D> selectJoinPage(PageParam pageParam, Class<D> clazz, MPJLambdaWrapper<T> lambdaWrapper) { // 特殊:不分页,直接查询全部 - if (PageParam.PAGE_SIZE_NONE.equals(pageParam.getPageNo())) { + if (PageParam.PAGE_SIZE_NONE.equals(pageParam.getPageSize())) { List<D> list = selectJoinList(clazz, lambdaWrapper); return new PageResult<>(list, (long) list.size()); } @@ -185,7 +185,7 @@ return Db.updateBatchById(entities, size); } - default Boolean insertOrUpdate(T entity) { + default boolean insertOrUpdate(T entity) { return Db.saveOrUpdate(entity); } -- Gitblit v1.9.3