From 272ca613ee64154882111851a06f3e182fedba8a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 19 九月 2024 13:45:57 +0800
Subject: [PATCH] update mybatis-plus 3.5.7 => 3.5.8 代码适配更改
---
pom.xml | 2 +-
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java | 26 ++++++--------------------
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java | 4 ++--
3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2cd2a81..608c0cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<easyexcel.version>4.0.2</easyexcel.version>
<velocity.version>2.3</velocity.version>
<satoken.version>1.39.0</satoken.version>
- <mybatis-plus.version>3.5.7</mybatis-plus.version>
+ <mybatis-plus.version>3.5.8</mybatis-plus.version>
<p6spy.version>3.9.1</p6spy.version>
<hutool.version>5.8.31</hutool.version>
<spring-boot-admin.version>3.2.3</spring-boot-admin.version>
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 956be9f..a8a1e86 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
@@ -18,9 +18,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 鑷畾涔� Mapper 鎺ュ彛, 瀹炵幇 鑷畾涔夋墿灞�
@@ -69,9 +67,7 @@
* @return 鎻掑叆鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean insertBatch(Collection<T> entityList) {
- Db.saveBatch(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveBatch(entityList);
}
/**
@@ -81,9 +77,7 @@
* @return 鏇存柊鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean updateBatchById(Collection<T> entityList) {
- Db.updateBatchById(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.updateBatchById(entityList);
}
/**
@@ -93,9 +87,7 @@
* @return 鎻掑叆鎴栨洿鏂版搷浣滄槸鍚︽垚鍔熺殑甯冨皵鍊�
*/
default boolean insertOrUpdateBatch(Collection<T> entityList) {
- Db.saveOrUpdateBatch(entityList);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveOrUpdateBatch(entityList);
}
/**
@@ -106,9 +98,7 @@
* @return 鎻掑叆鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean insertBatch(Collection<T> entityList, int batchSize) {
- Db.saveBatch(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveBatch(entityList, batchSize);
}
/**
@@ -119,9 +109,7 @@
* @return 鏇存柊鎿嶄綔鏄惁鎴愬姛鐨勫竷灏斿��
*/
default boolean updateBatchById(Collection<T> entityList, int batchSize) {
- Db.updateBatchById(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.updateBatchById(entityList, batchSize);
}
/**
@@ -132,9 +120,7 @@
* @return 鎻掑叆鎴栨洿鏂版搷浣滄槸鍚︽垚鍔熺殑甯冨皵鍊�
*/
default boolean insertOrUpdateBatch(Collection<T> entityList, int batchSize) {
- Db.saveOrUpdateBatch(entityList, batchSize);
- // 涓存椂瑙ｅ喅 鏂扮増鏈� mp 鎻掑叆鐘舵�佸垽鏂敊璇棶棰�
- return true;
+ return Db.saveOrUpdateBatch(entityList, batchSize);
}
/**
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
index 5ac74c3..ab7e0f6 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
@@ -6,8 +6,8 @@
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.Parenthesis;
import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
+import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import org.apache.ibatis.io.Resources;
import org.dromara.common.core.domain.dto.RoleDTO;
@@ -106,7 +106,7 @@
try {
Expression expression = CCJSqlParserUtil.parseExpression(dataFilterSql);
// 鏁版嵁鏉冮檺浣跨敤鍗曠嫭鐨勬嫭鍙� 闃叉涓庡叾浠栨潯浠跺啿绐�
- Parenthesis parenthesis = new Parenthesis(expression);
+ ParenthesedExpressionList<Expression> parenthesis = new ParenthesedExpressionList<>(expression);
if (ObjectUtil.isNotNull(where)) {
return new AndExpression(where, parenthesis);
} else {
--
Gitblit v1.9.3