From 920aead30f88ab8d10572e4822cdc592223c1218 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Wed, 5 Jul 2023 15:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TerminalBaseServiceImpl.java | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
index ad8935c50..05ecd7e59 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -1897,11 +1897,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     deviceBakLambdaQueryWrapper.eq(DeviceBak::getDevId, oracleTerminalExcel.getDeviceId());
                     List<DeviceBak> deviceBaks = deviceBakService.list(deviceBakLambdaQueryWrapper);
                     List<String> devIds = deviceBaks.stream().map(DeviceBak::getId).collect(Collectors.toList());
-                    LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>();
-                    devLambda.in(Line::getId, devIds)
-                            .orderByAsc(Line::getCreateTime)
-                            .eq(Line::getState, DataStateEnum.ENABLE.getCode());
-                    List<Line> devList = lineMapper.selectList(devLambda);
+                    List<Line> devList = new ArrayList<>();
+                    if(!CollectionUtil.isEmpty(devIds)){
+                        LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>();
+                        devLambda.in(Line::getId, devIds)
+                                .orderByAsc(Line::getCreateTime)
+                                .eq(Line::getState, DataStateEnum.ENABLE.getCode());
+                        devList = lineMapper.selectList(devLambda);
+                    }
                     if (CollectionUtil.isEmpty(deviceBaks) || CollectionUtil.isEmpty(devList)) {
                         temp = assembleLine(deviceName, LineBaseEnum.DEVICE_LEVEL.getCode(), pids.get(LineBaseEnum.SUB_LEVEL.getCode()), pids);
                         this.baseMapper.insert(temp);
@@ -2040,11 +2043,14 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     lineBakLambdaQueryWrapper.eq(LineBak::getLineId, oracleTerminalExcel.getId());
                     List<LineBak> lineBaks = lineBakService.list(lineBakLambdaQueryWrapper);
                     List<String> lineIds = lineBaks.stream().map(LineBak::getId).collect(Collectors.toList());
-                    LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>();
-                    devLambda.in(Line::getId, lineIds)
-                            .orderByAsc(Line::getCreateTime)
-                            .eq(Line::getState, DataStateEnum.ENABLE.getCode());
-                    List<Line> lineList = lineMapper.selectList(devLambda);
+                    List<Line> lineList = new ArrayList<>();
+                    if(CollectionUtil.isNotEmpty(lineIds)){
+                        LambdaQueryWrapper<Line> devLambda = new LambdaQueryWrapper<>();
+                        devLambda.in(Line::getId, lineIds)
+                                .orderByAsc(Line::getCreateTime)
+                                .eq(Line::getState, DataStateEnum.ENABLE.getCode());
+                        lineList = lineMapper.selectList(devLambda);
+                    }
                     if (CollectionUtil.isEmpty(lineBaks) || CollectionUtil.isEmpty(lineList)) {
                         temp = assembleLine(lineName, LineBaseEnum.LINE_LEVEL.getCode(), pids.get(LineBaseEnum.SUB_V_LEVEL.getCode()), pids);
                         this.baseMapper.insert(temp);