From cfbabc1fb3e48620696362fcef16952a16550c6c Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Tue, 5 Mar 2024 19:54:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=95=B0=E7=BB=84=E8=B6=8A?= =?UTF-8?q?=E7=95=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/utils/QueryHelp.java | 15 ++++++++++++--- .../product/TbProductStockDetailController.java | 1 - .../impl/productimpl/TbProductServiceImpl.java | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java b/eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java index 7cc3d442..fc83217e 100644 --- a/eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java +++ b/eladmin-common/src/main/java/cn/ysk/cashier/utils/QueryHelp.java @@ -160,9 +160,18 @@ public class QueryHelp { list.add(cb.isNull(getExpression(attributeName,join,root))); break; case BETWEEN: - List between = new ArrayList<>((List)val); - list.add(cb.between(getExpression(attributeName, join, root).as((Class) between.get(0).getClass()), - (Comparable) between.get(0), (Comparable) between.get(1))); + if (val instanceof List) { + List betweenList = (List) val; + // 确保列表不为空且包含两个元素 + if (betweenList.size() == 2) { + // 进行类型转换并执行 BETWEEN 查询 + List between = new ArrayList<>(betweenList); + list.add(cb.between( + getExpression(attributeName, join, root).as((Class) between.get(0).getClass()), + (Comparable) between.get(0), + (Comparable) between.get(1))); + } + } break; default: break; } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java index aee53f17..87d734c5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockDetailController.java @@ -62,7 +62,6 @@ public class TbProductStockDetailController { @PostMapping("/stock") @Log("查询/product/Stock") @ApiOperation("查询/product/Stock") -// @PreAuthorize("@el.check('tbProductStockDetail:list')") public ResponseEntity queryPage(@RequestBody TbProductStockDetailQueryCriteria criteria){ return new ResponseEntity<>(tbProductStockDetailService.queryPage(criteria),HttpStatus.OK); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 7706b47c..41145263 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -176,6 +176,7 @@ public class TbProductServiceImpl implements TbProductService { tbProductVo.setGroupSnap(ListUtil.stringChangeList(tbProduct.getGroupSnap())); } BeanUtils.copyProperties(tbProduct, tbProductVo); + tbProductVo.setImages(ListUtil.stringChangeStringList(tbProduct.getImages())); HashMap map = new HashMap<>();