From b6866d4691a78a16d8089f82b90b0aeba8f7cd6e Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 29 Dec 2018 18:40:16 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/springblade/core/mp/base/BaseEntity.java | 2 -- .../main/java/org/springblade/core/mp/support/Condition.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseEntity.java b/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseEntity.java index ab5e732..8b26a4e 100644 --- a/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseEntity.java +++ b/blade-core-mybatis/src/main/java/org/springblade/core/mp/base/BaseEntity.java @@ -18,7 +18,6 @@ package org.springblade.core.mp.base; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -79,7 +78,6 @@ public class BaseEntity implements Serializable { /** * 状态[0:未删除,1:删除] */ - @TableLogic @ApiModelProperty(value = "是否已删除") private Integer isDeleted; } diff --git a/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java b/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java index 1baddf2..a586de9 100644 --- a/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java +++ b/blade-core-mybatis/src/main/java/org/springblade/core/mp/support/Condition.java @@ -18,6 +18,7 @@ package org.springblade.core.mp.support; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; @@ -75,6 +76,7 @@ public class Condition { } }); } + qw.eq(BladeConstant.IS_DELETED_FIELD, BladeConstant.DB_NOT_DELETED); return qw; }