third_codes/mybatis-plus-join
1
0
Fork 0
mirror of https://gitee.com/best_handsome/mybatis-plus-join synced 2025-07-11 00:02:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

兼容各版本mp

Browse Source
This commit is contained in:
yulichang 2021-06-24 14:20:13 +08:00
parent 4bbe963579
commit 1d0b6fd434
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/baomidou/mybatisplus/core/metadata/MPJTableInfoHelper.java
View File

@ -180,9 +180,9 @@ public class MPJTableInfoHelper {
tableInfo.setTableName(targetTableName); tableInfo.setTableName(targetTableName);
/* 开启了自定义 KEY 生成器 */ /* 开启了自定义 KEY 生成器 */
if (CollectionUtils.isNotEmpty(dbConfig.getKeyGenerators())) { // if (CollectionUtils.isNotEmpty(dbConfig.getKeyGenerators())) {
tableInfo.setKeySequence(clazz.getAnnotation(KeySequence.class)); // tableInfo.setKeySequence(clazz.getAnnotation(KeySequence.class));
} // }
return excludeProperty; return excludeProperty;
} }
@ -230,8 +230,6 @@ public class MPJTableInfoHelper {
boolean existTableId = isExistTableId(list); boolean existTableId = isExistTableId(list);
// 是否存在 @TableLogic 注解 // 是否存在 @TableLogic 注解
boolean existTableLogic = isExistTableLogic(list); boolean existTableLogic = isExistTableLogic(list);
// 是否存在 @OrderBy 注解
boolean existOrderBy = isExistOrderBy(list);
List<TableFieldInfo> fieldList = new ArrayList<>(list.size()); List<TableFieldInfo> fieldList = new ArrayList<>(list.size());
for (Field field : list) { for (Field field : list) {
@ -261,12 +259,12 @@ public class MPJTableInfoHelper {
/* 有 @TableField 注解的字段初始化 */ /* 有 @TableField 注解的字段初始化 */
if (tableField != null) { 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; continue;
} }
/* 无 @TableField 注解的字段初始化 */ /* 无 @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)); return list.stream().anyMatch(field -> field.isAnnotationPresent(TableLogic.class));
} }
/**
* <p>
* 判断排序注解是否存在
* </p>
*
* @param list 字段列表
* @return true 为存在 @TableId 注解;
*/
public static boolean isExistOrderBy(List<Field> list) {
return list.stream().anyMatch(field -> field.isAnnotationPresent(OrderBy.class));
}
/** /**
* <p> * <p>
* 主键属性初始化 * 主键属性初始化