@@ -63,7 +63,9 @@ private SpreadsheetConfigEntity duplicateSpreadsheetConfigEntity(UUID id) {
63
63
.name (entity .getName ())
64
64
.sheetType (entity .getSheetType ())
65
65
.build ();
66
- duplicate .setNodeAliases (new ArrayList <>(entity .getNodeAliases ()));
66
+ if (entity .getNodeAliases () != null ) {
67
+ duplicate .setNodeAliases (new ArrayList <>(entity .getNodeAliases ()));
68
+ }
67
69
List <ColumnEntity > columns = entity .getColumns ().stream ()
68
70
.map (column -> ColumnEntity .builder ()
69
71
.name (column .getName ())
@@ -124,7 +126,9 @@ public void updateSpreadsheetConfig(UUID id, SpreadsheetConfigInfos dto) {
124
126
125
127
entity .setSheetType (dto .sheetType ());
126
128
entity .setName (dto .name ());
127
- entity .setNodeAliases (dto .nodeAliases ());
129
+ if (dto .nodeAliases () != null ) {
130
+ entity .setNodeAliases (new ArrayList <>(dto .nodeAliases ()));
131
+ }
128
132
entity .getColumns ().clear ();
129
133
if (dto .columns () != null ) {
130
134
entity .getColumns ().addAll (dto .columns ().stream ()
@@ -178,6 +182,8 @@ public UUID createSpreadsheetConfigCollectionFromConfigs(List<UUID> configUuids)
178
182
return clone ;
179
183
})
180
184
.toList ());
185
+ List <String > allConfigsUniqueAliases = entity .getSpreadsheetConfigs ().stream ().map (SpreadsheetConfigEntity ::getNodeAliases ).flatMap (Collection ::stream ).collect (Collectors .toSet ()).stream ().toList ();
186
+ entity .setNodeAliases (new ArrayList <>(allConfigsUniqueAliases ));
181
187
return spreadsheetConfigCollectionRepository .save (entity ).getId ();
182
188
}
183
189
@@ -267,7 +273,9 @@ public UUID duplicateSpreadsheetConfigCollection(UUID id) {
267
273
.name (config .getName ())
268
274
.sheetType (config .getSheetType ())
269
275
.build ();
270
- configDuplicate .setNodeAliases (new ArrayList <>(config .getNodeAliases ()));
276
+ if (config .getNodeAliases () != null ) {
277
+ configDuplicate .setNodeAliases (new ArrayList <>(config .getNodeAliases ()));
278
+ }
271
279
configDuplicate .setColumns (config .getColumns ().stream ()
272
280
.map (column -> ColumnEntity .builder ()
273
281
.name (column .getName ())
0 commit comments