Browse Source

临时解决

skyline 2 years ago
parent
commit
fed3e4b033

+ 2 - 2
service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -76,7 +76,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
             //station.setPictures(stations.stream().filter(item -> item.getStationId().equals(station.getStationId())).toList().get(0).getPictures());
         });
 
-        stationList.forEach(vo -> vo.setEquipmentInfos(vo.getEquipmentInfos().stream().sorted(Comparator.comparing(EnEquipmentInfo::getShortId)).toList()));
+        stationList.forEach(vo -> vo.setEquipmentInfos(vo.getEquipmentInfos().stream()/*.sorted(Comparator.comparing(EnEquipmentInfo::getShortId))*/.toList()));
         return stationList;
 
     }
@@ -149,7 +149,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
                         });
                     }
                 });
-                equipmentList.sort(Comparator.comparing(EquipmentInfo::getShortId));
+//                equipmentList.sort(Comparator.comparing(EquipmentInfo::getShortId));
             }
             var station = new Station();
             BeanUtils.copyProperties(vo, station);