From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 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 bd05f56..ad15598
--- a/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
+++ b/java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java
@@ -242,12 +242,14 @@
 //                }
 //                afterValue.put(tmpKeys[keyIndex], tmpValues[keyIndex]);
 //            }
-//            afterValues.add(afterValue);
+//
 //        }
+
+        afterValues.add(sqlValue);
 
         JSONObject logText = new JSONObject();
         logText.put("preValue", preValues);
-        logText.put("afterValue", sqlValue);
+        logText.put("afterValue", afterValues);
 
         OrderItemDto orderItemDto = new OrderItemDto();
         orderItemDto.setbId("-1");
@@ -313,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;
@@ -328,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("=");
@@ -344,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