Skip to content

Commit efccb8e

Browse files
committed
修复多个字段用同一字典会定义多次问题
1 parent b381ad0 commit efccb8e

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

tang-generator/src/main/java/com/tang/generator/utils/VelocityUtils.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tang.generator.utils;
22

33
import java.io.StringWriter;
4-
import java.util.ArrayList;
54
import java.util.List;
5+
import java.util.stream.Collectors;
66
import java.util.stream.Stream;
77

88
import org.apache.commons.lang3.StringUtils;
@@ -148,13 +148,11 @@ private static String getDictTypeVar(GenTable table) {
148148
* @return 字典集合
149149
*/
150150
private static List<String> getDictTypeList(GenTable table) {
151-
var dictTypeList = new ArrayList<String>();
152-
for (GenTableColumn tableColumn : table.getTableColumnList()) {
153-
if (StringUtils.isNotBlank(tableColumn.getDictType())) {
154-
dictTypeList.add(tableColumn.getDictType());
155-
}
156-
}
157-
return dictTypeList;
151+
return table.getTableColumnList().stream()
152+
.map(GenTableColumn::getDictType)
153+
.filter(StringUtils::isNotBlank)
154+
.distinct()
155+
.collect(Collectors.toList());
158156
}
159157

160158
/**

0 commit comments

Comments
 (0)