diff --git a/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java b/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java index aa5e648..d7fad5a 100644 --- a/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java +++ b/src/main/java/com/imyeyu/spring/mapper/BaseMapper.java @@ -36,15 +36,15 @@ public interface BaseMapper { DESC } + /** 当前时间戳毫秒 */ + String UNIX_TIME = " FLOOR(UNIX_TIMESTAMP(NOW(3)) * 1000) "; + /** 未删除条件 */ - String NOT_DELETE = " AND `deleted_at` IS NULL "; + String NOT_DELETE = " AND (`deleted_at` IS NULL OR " + UNIX_TIME + " < `deleted_at`) "; /** 限制一条 */ String LIMIT_1 = " LIMIT 1"; - /** 当前时间戳毫秒 */ - String UNIX_TIME = " FLOOR(UNIX_TIMESTAMP(NOW(3)) * 1000) "; - /** 分页限制 */ String PAGE = NOT_DELETE + " LIMIT #{offset}, #{limit}";