Ver Fonte

:zap: 优化代码

smallchill há 6 anos atrás
pai
commit
b6866d4691

+ 0 - 2
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;
 }

+ 2 - 0
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;
 	}