Skip to content

Commit 2d2ce25

Browse files
committed
refactor: 优化findColumn方法
1 parent c13534e commit 2d2ce25

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

  • hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query

hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzer.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,12 @@ public Optional<Column> findColumn(String name) {
117117
return Optional.of(column);
118118
}
119119

120+
String snake = QueryHelperUtils.toSnake(name);
121+
120122
for (Column col : columnList) {
121-
if (Objects.equals(col.name, name) || Objects.equals(col.name, QueryHelperUtils.toSnake(name))) {
123+
if (Objects.equals(col.name, name)
124+
|| Objects.equals(col.name, snake)
125+
|| Objects.equals(QueryHelperUtils.toSnake(col.alias), snake)) {
122126
return Optional.of(col);
123127
}
124128
}
@@ -162,6 +166,10 @@ class Column implements Feature {
162166
//元数据信息
163167
RDBColumnMetadata metadata;
164168

169+
public String getFullName() {
170+
return owner != null ? owner + "." + name : name;
171+
}
172+
165173
public Column moveOwner(String owner) {
166174
return new Column(name, alias, owner, metadata);
167175
}

0 commit comments

Comments
 (0)