diff --git a/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java b/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java index e3358fb..4a4bd74 100644 --- a/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java +++ b/src/main/java/com/heai/modules/grid/service/impl/GridTableUserServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Comparator; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -28,15 +29,21 @@ public class GridTableUserServiceImpl extends ServiceImpl seen = new HashSet<>(); + List deduped = gridTableUsers.stream() + .filter(item -> seen.add(item.getColumnProp())) + .sorted(Comparator.comparing(GridTableUser::getSortLv, Comparator.nullsLast(Integer::compareTo))) + .collect(Collectors.toList()); + + this.saveBatch(deduped); }