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;