From a12212c689b9751c86f8d0630a84b33e2b7a4aed Mon Sep 17 00:00:00 2001
From: seesaw <seesawgzz@gmail.com>
Date: Mon, 19 Aug 2024 13:53:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=93=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceinfo/DeviceInfoServiceImpl.java     |  9 +++++---
 .../service/devuce/DevuceServiceImpl.java     | 22 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java
index 6d8efb02..649f48f9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/deviceinfo/DeviceInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.service.deviceinfo;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.controller.admin.deviceinfo.vo.DeviceInfoPageReqVO;
@@ -106,9 +107,11 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
             }
         }
 
-        deviceInfoMapper.update(new DeviceInfoDO(),new LambdaUpdateWrapper<DeviceInfoDO>()
-                .set(DeviceInfoDO::getAlive,"0")
-                .in(DeviceInfoDO::getDeviceIp,updateList));
+        if(CollectionUtil.isNotEmpty(updateList)){
+            deviceInfoMapper.update(new DeviceInfoDO(),new LambdaUpdateWrapper<DeviceInfoDO>()
+                    .set(DeviceInfoDO::getAlive,"0")
+                    .in(DeviceInfoDO::getDeviceIp,updateList));
+        }
         return updateList.size();
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
index ebcd5fa5..95b47abc 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
@@ -155,20 +155,20 @@ public class DevuceServiceImpl implements DevuceService {
     @Override
     public List<DishesDO> getDishesList(Long carteenId,Long dishecType) {
         //获取已绑定的菜品id
-        List<Long> collect = devuceMapper.selectList(new LambdaQueryWrapperX<DevuceDO>()
-                .eq(DevuceDO::getBind, DevuceDO.BIND))
-                .stream()
-                .map(DevuceDO::getDishesId).collect(Collectors.toList());
-        if(ObjUtil.isNotEmpty(collect)){
-            return  dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
-                    .notIn(DishesDO::getId, collect)
-                    .eq(DishesDO::getCarteenId,carteenId)
-                    .eq(DishesDO::getDishecType,dishecType));
-        }else{
+//        List<Long> collect = devuceMapper.selectList(new LambdaQueryWrapperX<DevuceDO>()
+//                .eq(DevuceDO::getBind, DevuceDO.BIND))
+//                .stream()
+//                .map(DevuceDO::getDishesId).collect(Collectors.toList());
+//        if(ObjUtil.isNotEmpty(collect)){
+//            return  dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
+//                    .notIn(DishesDO::getId, collect)
+//                    .eq(DishesDO::getCarteenId,carteenId)
+//                    .eq(DishesDO::getDishecType,dishecType));
+//        }else{
             return   dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
                     .eq(DishesDO::getCarteenId,carteenId)
                     .eq(DishesDO::getDishecType,dishecType));
-        }
+//        }
 
     }