From ffa903afcc8b3c56b109a8d2c1333e9c0395e4c3 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Thu, 17 Aug 2023 13:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../csdevice/service/impl/RoleEngineerDevServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java index a91a80b..d0e9990 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java @@ -71,9 +71,15 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService { List csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper); List collect2 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList()); csLedgerQueryWrapper.clear(); + if(CollectionUtils.isEmpty(collect2)){ + return new ArrayList<>(); + } csLedgerQueryWrapper.in("id",collect2).eq("level",1); csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper); List collect3 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect3)){ + return new ArrayList<>(); + } collect.addAll(collect3); collect = collect.stream().distinct().collect(Collectors.toList()); return collect;