Bläddra i källkod

!306 优化数据变更插件代码
Merge pull request !306 from yuxiaobin/3.0

yuxiaobin 1 år sedan
förälder
incheckning
7eee3d4fe6

+ 3 - 4
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DataChangeRecorderInnerInterceptor.java

@@ -200,7 +200,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
         result.setTableName(insertStmt.getTable().getName());
         result.setRecordStatus(true);
         Map<String, Object> updatedColumnDatas = getUpdatedColumnDatas(result.getTableName(), boundSql, insertStmt);
-        result.buildDataStr(compareAndGetUpdatedColumnDatas(result.getTableName(), boundSql, insertStmt, null, updatedColumnDatas));
+        result.buildDataStr(compareAndGetUpdatedColumnDatas(result.getTableName(), null, updatedColumnDatas));
         return result;
     }
 
@@ -245,7 +245,7 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
         result.setOperation("update");
         result.setTableName(table.getName());
         result.setRecordStatus(true);
-        result.buildDataStr(compareAndGetUpdatedColumnDatas(result.getTableName(), boundSql, updateStmt, originalData, updatedColumnDatas));
+        result.buildDataStr(compareAndGetUpdatedColumnDatas(result.getTableName(), originalData, updatedColumnDatas));
         return result;
     }
 
@@ -347,11 +347,10 @@ public class DataChangeRecorderInnerInterceptor implements InnerInterceptor {
     }
 
     /**
-     * @param updateSql
      * @param originalDataObj
      * @return
      */
-    private List<DataChangedRecord> compareAndGetUpdatedColumnDatas(String tableName, BoundSql updateSql, Statement statement, OriginalDataObj originalDataObj, Map<String, Object> columnNameValMap) {
+    private List<DataChangedRecord> compareAndGetUpdatedColumnDatas(String tableName, OriginalDataObj originalDataObj, Map<String, Object> columnNameValMap) {
         final Set<String> ignoredColumns = ignoredTableColumns.get(tableName.toUpperCase());
         if (originalDataObj == null || originalDataObj.isEmpty()) {
             DataChangedRecord oneRecord = new DataChangedRecord();

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -227,7 +227,7 @@ class H2UserTest extends BaseTest {
         System.out.println("===============================================");
         userService.lambdaUpdate().set(H2User::getAge, AgeEnum.THREE).eq(H2User::getTestId, id).update();
         UpdateWrapper<H2User> wp = new UpdateWrapper<>();
-        wp.set("age", AgeEnum.TWO).eq("test_id", id);
+        wp.set("age", AgeEnum.TWO);
         wp.set("name", "yanjinyin@gitee");
         userService.update(wp);