!30 解决生成前段代码字典数据重复bug

goldenzjy · elunez · commit 7cef6f8bf289 · 2022-06-14T07:24:56.000Z
* 解决生产前段代码字典数据重复bug：但一个页面中多个项目管理同一个字典时，数据重复
diff --git a/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java b/eladmin-generator/src/main/java/me/zhengjie/utils/GenUtil.java
@@ -1,4 +1,4 @@
-/*
+﻿/*
  *  Copyright 2019-2020 Zheng Jie
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -276,7 +276,8 @@ private static Map<String, Object> getGenMap(List<ColumnInfo> columnInfos, GenCo
             // 主键存在字典
             if (StringUtils.isNotBlank(column.getDictName())) {
                 genMap.put("hasDict", true);
-                dicts.add(column.getDictName());
+                if(!dicts.contains(column.getDictName()))
+                    dicts.add(column.getDictName());
             }
 
             // 存储字段类型

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*`
	`1`	`+/*`
`2`	`2`	`* Copyright 2019-2020 Zheng Jie`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`@@ -276,7 +276,8 @@ private static Map<String, Object> getGenMap(List<ColumnInfo> columnInfos, GenCo`
`276`	`276`	`// 主键存在字典`
`277`	`277`	`if (StringUtils.isNotBlank(column.getDictName())) {`
`278`	`278`	`genMap.put("hasDict", true);`
`279`		`- dicts.add(column.getDictName());`
	`279`	`+ if(!dicts.contains(column.getDictName()))`
	`280`	`+ dicts.add(column.getDictName());`
`280`	`281`	`}`
`281`	`282`
`282`	`283`	`// 存储字段类型`