From 755262ba9a1a3c0573a0e910bbd0a353e9e2a2c5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 16 六月 2021 16:39:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
old mode 100644
new mode 100755
index 4d9bcaa..ad15598
--- a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
+++ b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
@@ -315,12 +315,15 @@
String tmpKey = orgSql.substring(orgSql.indexOf("(") + 1, orgSql.indexOf(")"));
String[] tmpKeys = tmpKey.split(",");
- if (values.size() < tmpKeys.length) {
- throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
- }
+// if (values.size() < tmpKeys.length) {
+// throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
+// }
for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
String key = tmpKeys[keyIndex].trim();
String value = "";
+ if (values.size() - 1 < keyIndex) {
+ continue;
+ }
value = values.get(keyIndex);
if ("''".equals(value)) {
continue;
@@ -330,9 +333,9 @@
} else if (sqlCommandType == SqlCommandType.UPDATE) {
String tmpKey = orgSql.substring(sql.indexOf("set") + 3, orgSql.indexOf("where"));
String[] tmpKeys = tmpKey.split(",");
- if (values.size() < tmpKeys.length) {
- throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
- }
+// if (values.size() < tmpKeys.length) {
+// throw new IllegalArgumentException("sql 閿欒 key 鍜寁alue 涓暟涓嶇瓑" + sql);
+// }
for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
String tmpSetKey = tmpKeys[keyIndex];
String[] keyValues = tmpSetKey.split("=");
@@ -346,6 +349,9 @@
key = keyValues[0].trim();
}
String value = "";
+ if (values.size() - 1 < keyIndex) {
+ continue;
+ }
value = values.get(keyIndex);
if ("''".equals(value)) {
continue;
--
Gitblit v1.8.0