diff --git a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java b/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java index 6850859..6cd03e2 100644 --- a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java @@ -504,14 +504,17 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl resList = Lists.newArrayList(); if(toSourceEntity.getSort()<=sort){ - sourceOtherEntities.stream().filter(s -> s.getSort() < sort) - .sorted(Comparator.comparing(IotThingSourceEntity::getSort)) + List list = sourceOtherEntities.stream().filter(s -> s.getSort() < sort).toList(); + list.stream().sorted(Comparator.comparing(IotThingSourceEntity::getSort)) .forEach(s -> s.setSort(aLong.incrementAndGet())); + resList.addAll(list); sourceEntity.setSort(aLong.incrementAndGet()); - mapper.update(sourceEntity); - sourceOtherEntities.stream() + resList.add(sourceEntity); + List list1 = sourceOtherEntities.stream().filter(s -> s.getSort() >= sort).toList(); + list1.stream() .sorted(Comparator.comparing(IotThingSourceEntity::getSort)) - .filter(s -> s.getSort() >= sort).forEach(s -> s.setSort(aLong.incrementAndGet())); + .forEach(s -> s.setSort(aLong.incrementAndGet())); + resList.addAll(list1); }else{ List list = sourceOtherEntities.stream().filter(s -> s.getSort() <= sort).toList(); list.stream().sorted(Comparator.comparing(IotThingSourceEntity::getSort))