因为两个 updateByExample 是批量更新，所以不需要乐观锁控制。

abel533 · abel533 · commit eeb84eb2777f · 2019-01-09T21:41:50.000+08:00
diff --git a/base/src/main/java/tk/mybatis/mapper/provider/ExampleProvider.java b/base/src/main/java/tk/mybatis/mapper/provider/ExampleProvider.java
@@ -142,7 +142,7 @@ public String updateByExampleSelective(MappedStatement ms) {
             sql.append(SqlHelper.exampleHasAtLeastOneCriteriaCheck("example"));
         }
         sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "example"));
-        sql.append(SqlHelper.updateSetColumns(entityClass, "record", true, isNotEmpty()));
+        sql.append(SqlHelper.updateSetColumnsIgnoreVersion(entityClass, "record", true, isNotEmpty()));
         sql.append(SqlHelper.updateByExampleWhereClause());
         return sql.toString();
     }
@@ -164,7 +164,7 @@ public String updateByExample(MappedStatement ms) {
             sql.append(SqlHelper.exampleHasAtLeastOneCriteriaCheck("example"));
         }
         sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "example"));
-        sql.append(SqlHelper.updateSetColumns(entityClass, "record", false, false));
+        sql.append(SqlHelper.updateSetColumnsIgnoreVersion(entityClass, "record", false, false));
         sql.append(SqlHelper.updateByExampleWhereClause());
         return sql.toString();
     }
diff --git a/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java b/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java
@@ -511,6 +511,44 @@ public static String updateSetColumns(Class<?> entityClass, String entityName, b
         return sql.toString();
     }
 
+    /**
+     * update set列，不考虑乐观锁注解 @Version
+     *
+     * @param entityClass
+     * @param entityName  实体映射名
+     * @param notNull     是否判断!=null
+     * @param notEmpty    是否判断String类型!=''
+     * @return
+     */
+    public static String updateSetColumnsIgnoreVersion(Class<?> entityClass, String entityName, boolean notNull, boolean notEmpty) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("<set>");
+        //获取全部列
+        Set<EntityColumn> columnSet = EntityHelper.getColumns(entityClass);
+        // 逻辑删除列
+        EntityColumn logicDeleteColumn = null;
+        //当某个列有主键策略时，不需要考虑他的属性是否为空，因为如果为空，一定会根据主键策略给他生成一个值
+        for (EntityColumn column : columnSet) {
+            if (column.getEntityField().isAnnotationPresent(LogicDelete.class)) {
+                if (logicDeleteColumn != null) {
+                    throw new LogicDeleteException(entityClass.getCanonicalName() + " 中包含多个带有 @LogicDelete 注解的字段，一个类中只能存在一个带有 @LogicDelete 注解的字段!");
+                }
+                logicDeleteColumn = column;
+            }
+            if (!column.isId() && column.isUpdatable()) {
+                if (column == logicDeleteColumn) {
+                    sql.append(logicDeleteColumnEqualsValue(column, false)).append(",");
+                } else if (notNull) {
+                    sql.append(SqlHelper.getIfNotNull(entityName, column, column.getColumnEqualsHolder(entityName) + ",", notEmpty));
+                } else {
+                    sql.append(column.getColumnEqualsHolder(entityName) + ",");
+                }
+            }
+        }
+        sql.append("</set>");
+        return sql.toString();
+    }
+
     /**
      * 不是所有参数都是 null 的检查
      *

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public String updateByExampleSelective(MappedStatement ms) {`
`142`	`142`	`sql.append(SqlHelper.exampleHasAtLeastOneCriteriaCheck("example"));`
`143`	`143`	`}`
`144`	`144`	`sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "example"));`
`145`		`- sql.append(SqlHelper.updateSetColumns(entityClass, "record", true, isNotEmpty()));`
	`145`	`+ sql.append(SqlHelper.updateSetColumnsIgnoreVersion(entityClass, "record", true, isNotEmpty()));`
`146`	`146`	`sql.append(SqlHelper.updateByExampleWhereClause());`
`147`	`147`	`return sql.toString();`
`148`	`148`	`}`
`@@ -164,7 +164,7 @@ public String updateByExample(MappedStatement ms) {`
`164`	`164`	`sql.append(SqlHelper.exampleHasAtLeastOneCriteriaCheck("example"));`
`165`	`165`	`}`
`166`	`166`	`sql.append(SqlHelper.updateTable(entityClass, tableName(entityClass), "example"));`
`167`		`- sql.append(SqlHelper.updateSetColumns(entityClass, "record", false, false));`
	`167`	`+ sql.append(SqlHelper.updateSetColumnsIgnoreVersion(entityClass, "record", false, false));`
`168`	`168`	`sql.append(SqlHelper.updateByExampleWhereClause());`
`169`	`169`	`return sql.toString();`
`170`	`170`	`}`