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 33ace1cf..d7547aaa 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 @@ -182,8 +182,9 @@ public class DevuceServiceImpl implements DevuceService { return dishesMapper.selectList(new LambdaQueryWrapperX() .eq(DishesDO::getCarteenId,carteenId) .gt(DishesDO::getId,94) - .eq(DishesDO::getDishecType,dishecType).orderByDesc(DishesDO::getId) - .like(StrUtil.isNotBlank(dishesName),DishesDO::getDishesName,dishesName)); + .eq(dishecType!=null,DishesDO::getDishecType,dishecType) + .like(StrUtil.isNotBlank(dishesName),DishesDO::getDishesName,dishesName) + .orderByDesc(DishesDO::getId)); // } }