修复UUID主键执行批量删除错误(待优化版本).

#6677

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/DeleteByIds.java

@@ -90,7 +90,8 @@ public String logicDeleteScript(TableInfo tableInfo, SqlMethod sqlMethod) {
         sqlSet += StringPool.EMPTY + tableInfo.getLogicDeleteSql(false, false);
         return String.format(sqlMethod.getSql(), tableInfo.getTableName(),
             sqlSet, tableInfo.getKeyColumn(), SqlScriptUtils.convertForeach(
-                SqlScriptUtils.convertChoose("@org.apache.ibatis.type.SimpleTypeRegistry@isSimpleType(item.getClass())",
+                //TODO 待优化，看是否改成判断只使用实体（顺便考虑下子类）？？
+                SqlScriptUtils.convertChoose("@org.apache.ibatis.type.SimpleTypeRegistry@isSimpleType(item.getClass()) or (mpFillEt!=null and item.getClass() != mpFillEt.getClass())",
                     "#{item}", "#{item." + tableInfo.getKeyProperty() + "}"),
                 COLL, null, "item", COMMA),
             tableInfo.getLogicDeleteSql(true, true));

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/UUIDEntity.java

@@ -0,0 +1,24 @@
+package com.baomidou.mybatisplus.test.uuid;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.util.UUID;
+
+@Data
+@TableName("entity")
+public class UUIDEntity {
+
+    @TableId(value = "id",type = IdType.INPUT)
+    private UUID id;
+
+    private String name;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private String deleteBy;
+
+    @TableField(fill = FieldFill.UPDATE)
+    @TableLogic(delval = "true", value = "false")
+    private Boolean deleted;
+
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/UUIDEntityMapper.java

@@ -0,0 +1,7 @@
+package com.baomidou.mybatisplus.test.uuid;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface UUIDEntityMapper extends BaseMapper<UUIDEntity> {
+
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/UUIDEntityTest.java

@@ -0,0 +1,88 @@
+package com.baomidou.mybatisplus.test.uuid;
+
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.test.BaseDbTest;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.Configuration;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.function.Consumer;
+
+public class UUIDEntityTest extends BaseDbTest<UUIDEntityMapper> {
+
+    @Test
+    void test() {
+        doTest(m -> {
+            var uuidEntity = new UUIDEntity();
+            uuidEntity.setId(UUID.randomUUID());
+            uuidEntity.setName("test1");
+            uuidEntity.setDeleted(false);
+            Assertions.assertEquals(1, m.insert(uuidEntity));
+            Assertions.assertNotNull(m.selectById(uuidEntity.getId()));
+            Assertions.assertEquals(1, m.deleteById(uuidEntity));
+        });
+
+        doTest(m -> {
+            var uuidEntity = new UUIDEntity();
+            uuidEntity.setId(UUID.randomUUID());
+            uuidEntity.setName("test2");
+            uuidEntity.setDeleted(false);
+            Assertions.assertEquals(1, m.insert(uuidEntity));
+            Assertions.assertEquals(1, m.deleteByIds(List.of(uuidEntity.getId())));
+        });
+
+        doTest(m -> {
+            var uuidEntity = new UUIDEntity();
+            uuidEntity.setId(UUID.randomUUID());
+            uuidEntity.setName("test3");
+            uuidEntity.setDeleted(false);
+            Assertions.assertEquals(1, m.insert(uuidEntity));
+            Assertions.assertEquals(1, m.deleteByIds(List.of(uuidEntity)));
+        });
+    }
+
+
+    @Override
+    protected Consumer<Configuration> consumer() {
+        return configuration -> {
+            configuration.getTypeHandlerRegistry().register(UUIDTypeHandler.class);
+        };
+    }
+
+    @Override
+    protected GlobalConfig globalConfig() {
+        return super.globalConfig().setMetaObjectHandler(new MetaObjectHandler() {
+            @Override
+            public void insertFill(MetaObject metaObject) {
+
+            }
+
+            @Override
+            public void updateFill(MetaObject metaObject) {
+                metaObject.setValue("deleteBy", "baomidou");
+            }
+        });
+    }
+
+    @Override
+    protected String tableDataSql() {
+        return "insert into entity values('0824eb71-e124-5ba1-56b9-87185d91f309','test',null, false)";
+    }
+
+    @Override
+    protected List<String> tableSql() {
+        return Arrays.asList("drop table if exists entity",
+            "CREATE TABLE IF NOT EXISTS entity (\n" +
+                "id VARCHAR(50) NOT NULL,\n" +
+                "name VARCHAR(30) NULL DEFAULT NULL,\n" +
+                "delete_by VARCHAR(30) NULL DEFAULT NULL," +
+                "deleted BOOLEAN NOT NULL DEFAULT false," +
+                "PRIMARY KEY (id)" +
+                ")");
+    }
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/uuid/UUIDTypeHandler.java

@@ -0,0 +1,38 @@
+package com.baomidou.mybatisplus.test.uuid;
+
+import org.apache.ibatis.type.*;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.UUID;
+
+@MappedTypes(UUID.class)
+@MappedJdbcTypes(JdbcType.VARCHAR)
+public class UUIDTypeHandler extends BaseTypeHandler<UUID> {
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, UUID parameter, JdbcType jdbcType) throws SQLException {
+        ps.setObject(i, parameter);
+    }
+
+    @Override
+    public UUID getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        String uuidStr = rs.getString(columnName);
+        return uuidStr == null ? null : UUID.fromString(uuidStr);
+    }
+
+    @Override
+    public UUID getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        String uuidStr = rs.getString(columnIndex);
+        return uuidStr == null ? null : UUID.fromString(uuidStr);
+    }
+
+    @Override
+    public UUID getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        String uuidStr = cs.getString(columnIndex);
+        return uuidStr == null ? null : UUID.fromString(uuidStr);
+    }
+
+}