From 57df13c9ca159527b40a45afccaf498bb05a87a0 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Thu, 17 Aug 2023 18:06:24 +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

---
 .../service/impl/RoleEngineerDevServiceImpl.java      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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 d0e9990..8eeea89 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
@@ -72,13 +72,13 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {
                 List<String> collect2 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList());
                 csLedgerQueryWrapper.clear();
                 if(CollectionUtils.isEmpty(collect2)){
-                    return new ArrayList<>();
+                    return collect;
                 }
                 csLedgerQueryWrapper.in("id",collect2).eq("level",1);
                 csLedgers = csLedgerMapper.selectList(csLedgerQueryWrapper);
                 List<String> collect3 = csLedgers.stream().map(CsLedger::getPid).distinct().collect(Collectors.toList());
                 if(CollectionUtils.isEmpty(collect3)){
-                    return new ArrayList<>();
+                    return  collect;
                 }
                 collect.addAll(collect3);
                 collect = collect.stream().distinct().collect(Collectors.toList());
@@ -121,16 +121,15 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {
         if(
                 Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode())){
             csDeviceUserPOQueryWrapper.clear();
-            csEngineeringUserPOQueryWrapper.clear();
-            csEngineeringUserPOQueryWrapper.lambda().eq(CsEngineeringUserPO::getUserId,userIndex);
-            List<CsEngineeringUserPO> csEngineeringUserPOS = csEngineeringUserMapper.selectList(csEngineeringUserPOQueryWrapper);
-            collect = csEngineeringUserPOS.stream().map(CsEngineeringUserPO::getEngineeringId).collect(Collectors.toList());
             csDeviceUserPOQueryWrapper.eq("status","1").and(wq -> {
                 wq.eq("primary_user_id", userIndex)
                         .or()
                         .eq("sub_user_id",userIndex);
             });
             List<CsDeviceUserPO> csDeviceUserPOS = csDeviceUserPOMapper.selectList(csDeviceUserPOQueryWrapper);
+            if(CollectionUtils.isEmpty(csDeviceUserPOS)){
+                return new ArrayList<>();
+            }
             List<String> collect1 = csDeviceUserPOS.stream().map(CsDeviceUserPO::getDeviceId).distinct().collect(Collectors.toList());
             return collect1;