From fe2b2e037a91fbc22bd887174d37c7dd229333d3 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 09 十一月 2021 15:02:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
index 665ad44..bed5276 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerReceiveController.java
@@ -49,9 +49,11 @@
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<CustomerReceive>> getByPage(PageVo page) {
-
- IPage<CustomerReceive> data = iCustomerReceiveService.page(PageUtil.initMpPage(page));
+ public Result<IPage<CustomerReceive>> getByPage(String name,PageVo page) {
+ QueryWrapper<CustomerReceive> wrapper = new QueryWrapper<>();
+ if (!StrUtil.isEmpty(name))
+ wrapper.like("b.name","%"+name+"%");
+ IPage<CustomerReceive> data = iCustomerReceiveService.page2(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<CustomerReceive>>().setData(data);
}
--
Gitblit v1.9.1