顺序调整

ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsSopServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -65,15 +66,18 @@ public class IsSopServiceImpl extends ServiceImpl<IsSopMapper, IsSop> implements
             List<Long> pointIds = isSopPoints.stream().map(IsSopPoints::getPointId).collect(Collectors.toList());
             // List<IsIsolationPoint> isIsolationPoints = iIsIsolationPointService.listByIds(pointIds);
             List<PointDetailVO> pointDetailVOList = iIsIsolationPointService.getPointDetailList(pointIds);
-            for (PointDetailVO pointDetailVO : pointDetailVOList) {
-                for (IsSopPoints isSopPoint : isSopPoints) {
+            // 需要顺序，所以重新准备一个集合，上面方法变更了我的数据顺序
+            ArrayList<PointDetailVO> pointDetailVOS = new ArrayList<>();
+            for (IsSopPoints isSopPoint : isSopPoints) {
+                for (PointDetailVO pointDetailVO : pointDetailVOList) {
                    if (pointDetailVO.getPointId().equals(isSopPoint.getPointId())) {
                        pointDetailVO.setPrePointId(isSopPoint.getPrePointId());
+                       pointDetailVOS.add(pointDetailVO);
                    }
                 }
             }
             // 3.1组合返回数据
-            sopDetailVO.setPointDetailVOList(pointDetailVOList);
+            sopDetailVO.setPointDetailVOList(pointDetailVOS);
         }
         // 4.查询人员信息
         List<IsSopUser> sopUserList = iIsSopUserService.list(Wrappers.<IsSopUser>lambdaQuery()