Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
2024-10-11 14:46:40 +08:00

View File

@@ -106,7 +106,7 @@ public class ShopPrinterServiceImpl extends ServiceImpl<TbPrintMachineMapper, Tb
if (StrUtil.isBlank(dto.getCategoryList())) {
throw new BadRequestException("分类打印选择部分打印时,必须勾选需要部分打印的菜品");
}
if (JSONUtil.isTypeJSONArray(dto.getCategoryList())) {
if (!JSONUtil.isTypeJSONArray(dto.getCategoryList())) {
throw new BadRequestException("传递的部分打印菜品数据不合法");
}
if (StrUtil.isBlank(dto.getCategoryIds())) {
@@ -132,7 +132,7 @@ public class ShopPrinterServiceImpl extends ServiceImpl<TbPrintMachineMapper, Tb
if (StrUtil.isBlank(dto.getCategoryList())) {
throw new BadRequestException("分类打印选择部分打印时,必须勾选需要部分打印的菜品");
}
if (JSONUtil.isTypeJSONArray(dto.getCategoryList())) {
if (!JSONUtil.isTypeJSONArray(dto.getCategoryList())) {
throw new BadRequestException("传递的部分打印菜品数据不合法");
}
if (StrUtil.isBlank(dto.getCategoryIds())) {
@@ -157,4 +157,5 @@ public class ShopPrinterServiceImpl extends ServiceImpl<TbPrintMachineMapper, Tb
baseMapper.update(null, new LambdaUpdateWrapper<TbPrintMachineEntity>()
.set(TbPrintMachineEntity::getStatus, status).eq(TbPrintMachineEntity::getId, id));
}
}