diff --git a/base/src/test/java/tk/mybatis/mapper/model/BaseLogicDelete.java b/base/src/test/java/tk/mybatis/mapper/model/BaseLogicDelete.java index 8b1fe67820a0562b183fe2820e0b5792d3cf6ea2..47b4ba3edf660783862f3bf3716bb7667998ae7e 100644 --- a/base/src/test/java/tk/mybatis/mapper/model/BaseLogicDelete.java +++ b/base/src/test/java/tk/mybatis/mapper/model/BaseLogicDelete.java @@ -12,7 +12,7 @@ public class BaseLogicDelete { @GeneratedValue(strategy = GenerationType.IDENTITY) protected Integer id; - @LogicDelete(isDeletedValue = 0, notDeletedValue = 1) + @LogicDelete(isDeletedValue = "0", notDeletedValue = "1") @Column(name = "is_valid") protected Integer isValid; diff --git a/core/src/main/java/tk/mybatis/mapper/annotation/LogicDelete.java b/core/src/main/java/tk/mybatis/mapper/annotation/LogicDelete.java index fc29872f5636068d466249129de7ee21658c1409..5a38d57c42c4ca73890d4542c437be51cd7c095f 100644 --- a/core/src/main/java/tk/mybatis/mapper/annotation/LogicDelete.java +++ b/core/src/main/java/tk/mybatis/mapper/annotation/LogicDelete.java @@ -12,8 +12,8 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) public @interface LogicDelete { - int isDeletedValue() default 1; + String isDeletedValue() default "1"; - int notDeletedValue() default 0; + String notDeletedValue() default "0"; } diff --git a/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java b/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java index 2378e17c4a7971aaa0684beb699fdfc9cd5c89a9..851845f06eaa7fe7b2b623918efa0a04362390ff 100644 --- a/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java +++ b/core/src/main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java @@ -774,7 +774,7 @@ public class SqlHelper { * @param isDeleted true:逻辑删除的值,false:未逻辑删除的值 * @return */ - public static int getLogicDeletedValue(EntityColumn column, boolean isDeleted) { + public static String getLogicDeletedValue(EntityColumn column, boolean isDeleted) { if (!column.getEntityField().isAnnotationPresent(LogicDelete.class)) { throw new LogicDeleteException(column.getColumn() + " 没有 @LogicDelete 注解!"); } diff --git a/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java b/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java index 78308e53a59bc03d15fe00b35d93b147cc4faa47..e42c2e7f8d2dc0594fa06d128c74c54b1fcdfa52 100644 --- a/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java +++ b/core/src/test/java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java @@ -50,7 +50,7 @@ class User { @Column(name = "username") private String username; - @LogicDelete(isDeletedValue = 0, notDeletedValue = 1) + @LogicDelete(isDeletedValue = "0", notDeletedValue = "1") @Column(name = "is_valid") private Integer isValid;