diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceSaveReqVO.java
index 68a17c17..bd38cdab 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceSaveReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/devuce/vo/DevuceSaveReqVO.java
@@ -1,9 +1,10 @@
 package cn.iocoder.yudao.module.system.controller.app.devuce.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 设备新增/修改 Request VO")
 @Data
@@ -17,6 +18,7 @@ public class DevuceSaveReqVO {
     private String deviceSn;
 
     @Schema(description = "菜品id", example = "17970")
+    @NotNull(message = "菜品id不能为空")
     private Long dishesId;
 
     @Schema(description = "是否绑定", requiredMode = Schema.RequiredMode.REQUIRED)
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 85057eb1..f789c08b 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
@@ -110,11 +110,17 @@ public class DevuceServiceImpl implements DevuceService {
                 .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));
+        }
 
-        return  dishesMapper.selectList(new LambdaQueryWrapperX<DishesDO>()
-                .notIn(DishesDO::getId, collect)
-                .eq(DishesDO::getCarteenId,carteenId)
-                .eq(DishesDO::getDishecType,dishecType));
     }
 
     /**