收发货人地址簿搜索字段为1个，模糊匹配电话和收发货人姓名

收发货人地址列表查询增加分页

hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java

@@ -111,12 +111,12 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl<LogisticsAddres
     public IPage<LogisticsAddressBook> getLogisticsAddressBookPageList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) {
         Page<LogisticsAddressBook> page = new Page<>();
         LambdaQueryWrapper<LogisticsAddressBook> 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);
     }
 

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;
 }