Skip to content

Commit f77577f

Browse files
committed
change:修改View的prefix&suffix逻辑,与Table逻辑保持一致
1 parent 2fe8158 commit f77577f

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

src/org/nutz/dao/impl/entity/AnnotationEntityMaker.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public <T> Entity<T> make(Class<T> type) {
116116
if (null == ti.annView)
117117
log.warnf("No @Table found, fallback to use table name='%s' for type '%s'", tableName, type.getName());
118118
} else {
119-
tableName = ti.annTable.value().isEmpty() ? Daos.getTableNameMaker().make(type) : ti.annTable.value();
119+
tableName = ti.annTable.value().isEmpty() ? Daos.getTableNameMaker().make(type) : ti.annTable.value();
120120
if (!ti.annTable.prefix().isEmpty()) {
121121
tableName = ti.annTable.prefix() + tableName;
122122
}
@@ -129,16 +129,12 @@ public <T> Entity<T> make(Class<T> type) {
129129
if (null == ti.annView) {
130130
viewName = tableName;
131131
} else {
132-
if (ti.annView.value().isEmpty()) {
133-
viewName = Daos.getViewNameMaker().make(type);
134-
} else {
135-
viewName = ti.annView.value();
136-
if (!ti.annView.prefix().isEmpty()) {
137-
viewName = ti.annView.prefix() + viewName;
138-
}
139-
if (!ti.annView.suffix().isEmpty()) {
140-
viewName = viewName + ti.annView.suffix();
141-
}
132+
viewName = ti.annView.value().isEmpty() ? Daos.getViewNameMaker().make(type) : ti.annView.value();
133+
if (!ti.annView.prefix().isEmpty()) {
134+
viewName = ti.annView.prefix() + viewName;
135+
}
136+
if (!ti.annView.suffix().isEmpty()) {
137+
viewName = viewName + ti.annView.suffix();
142138
}
143139
}
144140

0 commit comments

Comments
 (0)