From 1d0b6fd4341233ab36ada2fce358873a852d56dd Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Thu, 24 Jun 2021 14:20:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=90=84=E7=89=88=E6=9C=ACmp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/metadata/MPJTableInfoHelper.java | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableInfoHelper.java b/src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableInfoHelper.java index 3840386..e555896 100644 --- a/src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableInfoHelper.java +++ b/src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableInfoHelper.java @@ -180,9 +180,9 @@ public class MPJTableInfoHelper { tableInfo.setTableName(targetTableName); /* 开启了自定义 KEY 生成器 */ - if (CollectionUtils.isNotEmpty(dbConfig.getKeyGenerators())) { - tableInfo.setKeySequence(clazz.getAnnotation(KeySequence.class)); - } +// if (CollectionUtils.isNotEmpty(dbConfig.getKeyGenerators())) { +// tableInfo.setKeySequence(clazz.getAnnotation(KeySequence.class)); +// } return excludeProperty; } @@ -230,8 +230,6 @@ public class MPJTableInfoHelper { boolean existTableId = isExistTableId(list); // 是否存在 @TableLogic 注解 boolean existTableLogic = isExistTableLogic(list); - // 是否存在 @OrderBy 注解 - boolean existOrderBy = isExistOrderBy(list); List fieldList = new ArrayList<>(list.size()); for (Field field : list) { @@ -261,12 +259,12 @@ public class MPJTableInfoHelper { /* 有 @TableField 注解的字段初始化 */ if (tableField != null) { - fieldList.add(new TableFieldInfo(dbConfig, tableInfo, field, tableField, reflector, existTableLogic, existOrderBy)); + fieldList.add(new TableFieldInfo(dbConfig, tableInfo, field, tableField, reflector, existTableLogic)); continue; } /* 无 @TableField 注解的字段初始化 */ - fieldList.add(new TableFieldInfo(dbConfig, tableInfo, field, reflector, existTableLogic, existOrderBy)); + fieldList.add(new TableFieldInfo(dbConfig, tableInfo, field, reflector, existTableLogic)); } /* 字段列表 */ @@ -302,18 +300,6 @@ public class MPJTableInfoHelper { return list.stream().anyMatch(field -> field.isAnnotationPresent(TableLogic.class)); } - /** - *

- * 判断排序注解是否存在 - *

- * - * @param list 字段列表 - * @return true 为存在 @TableId 注解; - */ - public static boolean isExistOrderBy(List list) { - return list.stream().anyMatch(field -> field.isAnnotationPresent(OrderBy.class)); - } - /** *

* 主键属性初始化