Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化代码生成字典组重复问题

Browse Source
This commit is contained in:
RuoYi
2021-12-24 14:51:33 +08:00
parent 7b23b6db6f
commit e4df0c6da1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.generator.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import org.apache.velocity.VelocityContext; import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.constant.GenConstants;
@@ -270,7 +271,7 @@ public class VelocityUtils
public static String getDicts(GenTable genTable) public static String getDicts(GenTable genTable)
{ {
List<GenTableColumn> columns = genTable.getColumns(); List<GenTableColumn> columns = genTable.getColumns();
List<String> dicts = new ArrayList<String>(); Set<String> dicts = new HashSet<String>();
for (GenTableColumn column : columns) for (GenTableColumn column : columns)
{ {
if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(