From ceb8e7bd1221e934a6120bd6b33993b904e2473a Mon Sep 17 00:00:00 2001 From: qiaohui <924337501@qq.com> Date: Wed, 11 Sep 2024 00:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E5=8F=91=E8=B4=A7=E4=BA=BA=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=B0=BF=E6=90=9C=E7=B4=A2=E5=AD=97=E6=AE=B5=E4=B8=BA?= =?UTF-8?q?1=E4=B8=AA=EF=BC=8C=E6=A8=A1=E7=B3=8A=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=92=8C=E6=94=B6=E5=8F=91=E8=B4=A7=E4=BA=BA?= =?UTF-8?q?=E5=A7=93=E5=90=8D=20=E6=94=B6=E5=8F=91=E8=B4=A7=E4=BA=BA?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LogisticsAddressBookServiceImpl.java | 10 +++++----- .../vo/LogisticsAddressBookQueryVo.java | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java index 5df819b2..ba1636a9 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java @@ -111,12 +111,12 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl getLogisticsAddressBookPageList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) { Page page = new Page<>(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(logisticsAddressBookQueryVo != null && StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getShipperOrReceiverName())){ - wrapper.like(LogisticsAddressBook::getShipperOrReceiverName, logisticsAddressBookQueryVo.getShipperOrReceiverName()); - } - if(logisticsAddressBookQueryVo != null && StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getMobile())){ - wrapper.like(StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getMobile()), LogisticsAddressBook::getMobile, logisticsAddressBookQueryVo.getMobile()); + if(logisticsAddressBookQueryVo != null && StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getKeyWord())){ + wrapper.like(LogisticsAddressBook::getShipperOrReceiverName, logisticsAddressBookQueryVo.getKeyWord()).or() + .like(LogisticsAddressBook::getMobile, logisticsAddressBookQueryVo.getKeyWord()); } + page.setCurrent(logisticsAddressBookQueryVo.getPageNum()); + page.setSize(logisticsAddressBookQueryVo.getPageSize()); return logisticsAddressBookMapper.selectPage(page,wrapper); } diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java index e63ae0f2..f9bce7da 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java @@ -20,4 +20,7 @@ public class LogisticsAddressBookQueryVo extends HiverBasePageQuery { @ApiModelProperty(value = "收发货人名称") private String shipperOrReceiverName; + + + private String keyWord; }