From 5933b86466265719cc331accd46e86f01fd180b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Wed, 26 Jul 2023 10:57:48 +0800 Subject: [PATCH] feat: add TableInfo.buildQueryColumn() method --- .../com/mybatisflex/core/table/TableInfo.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java index 63db2a0f..7ad205ae 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java @@ -868,18 +868,24 @@ public class TableInfo { } Object value = metaObject.getValue(property); if (value != null && !"".equals(value)) { - QueryColumn queryColumn = TableDefs.getQueryColumn(entityClass, tableNameWithSchema, column); - if (queryColumn != null) { - queryWrapper.and(queryColumn.eq(value)); - } else { - queryWrapper.and(QueryMethods.column(tableNameWithSchema, column).eq(value)); - } + QueryColumn queryColumn = buildQueryColumn(column); + queryWrapper.and(queryColumn.eq(value)); } }); return queryWrapper; } + public QueryColumn buildQueryColumn(String column) { + String tableNameWithSchema = getTableNameWithSchema(); + QueryColumn queryColumn = TableDefs.getQueryColumn(entityClass, tableNameWithSchema, column); + if (queryColumn == null) { + queryColumn = QueryMethods.column(tableNameWithSchema, column); + } + return queryColumn; + } + + public String getKeyProperties() { StringJoiner joiner = new StringJoiner(","); for (IdInfo value : primaryKeyList) {