From 8bcffb59cdabe04d740dc4c8bb39765dfbb747c2 Mon Sep 17 00:00:00 2001
From: rse <119827+higashikaze@user.noreply.gitee.com>
Date: Fri, 6 May 2022 10:53:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=94=AF=E6=8C=81=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/tk/mybatis/mapper/model/BaseLogicDelete.java    | 2 +-
 .../main/java/tk/mybatis/mapper/annotation/LogicDelete.java   | 4 ++--
 .../main/java/tk/mybatis/mapper/mapperhelper/SqlHelper.java   | 2 +-
 .../java/tk/mybatis/mapper/mapperhelper/SqlHelperTest.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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 8b1fe67..47b4ba3 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 fc29872..5a38d57 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 2378e17..851845f 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 78308e5..e42c2e7 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;
 
-- 
Gitee