Commit 57b4ad7fb96d6bf34adc0a5e20bb9adfbf2d5d60
Merge remote-tracking branch 'origin/test'
Showing
1 changed file
with
3 additions
and
3 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
... | ... | @@ -97,14 +97,14 @@ public class PoolBizService { |
97 | 97 | Page<PublicPool> opage = new Page<>(queryVO.getCurrent(), queryVO.getPageSize()); |
98 | 98 | LambdaQueryWrapper<PublicPool> queryWrapper = Wrappers.<PublicPool>lambdaQuery() |
99 | 99 | .eq(PublicPool::getGroupId, queryVO.getGroupId()) |
100 | - .eq(StringUtils.isValid(queryVO.getPlateNo()), PublicPool::getPlateNo, "%" + queryVO.getPlateNo() + "%") | |
101 | - .eq(StringUtils.isValid(queryVO.getFrameNo()), PublicPool::getFrameNo, "%" + queryVO.getFrameNo() + "%") | |
100 | + .like(StringUtils.isValid(queryVO.getPlateNo()), PublicPool::getPlateNo, "%" + queryVO.getPlateNo() + "%") | |
101 | + .like(StringUtils.isValid(queryVO.getFrameNo()), PublicPool::getFrameNo, "%" + queryVO.getFrameNo() + "%") | |
102 | 102 | .eq(Objects.nonNull(queryVO.getType()), PublicPool::getType, queryVO.getType()) |
103 | 103 | .eq(Objects.nonNull(queryVO.getBrandId()), PublicPool::getBrandId, queryVO.getBrandId()) |
104 | 104 | .eq(Objects.nonNull(queryVO.getSeriesId()), PublicPool::getSeriesId, queryVO.getSeriesId()) |
105 | 105 | .eq(Objects.nonNull(queryVO.getSpecId()), PublicPool::getSpecId, queryVO.getSpecId()) |
106 | 106 | .in(CollectionUtils.isNotEmpty(queryVO.getShopIds()), PublicPool::getShopId, queryVO.getShopIds()) |
107 | - .eq(StringUtils.isValid(queryVO.getShopName()), PublicPool::getShopName, "%" + queryVO.getShopName() + "%") | |
107 | + .like(StringUtils.isValid(queryVO.getShopName()), PublicPool::getShopName, "%" + queryVO.getShopName() + "%") | |
108 | 108 | .notIn(CollectionUtils.isNotEmpty(custIds), PublicPool::getCustomerId, custIds); |
109 | 109 | if (Objects.nonNull(queryVO.getOrder()) && StringUtils.isValid(queryVO.getOrderAtt())) { |
110 | 110 | queryWrapper = queryWrapper.orderBy(true, 1 == queryVO.getOrder(), PublicPool::getTimes); | ... | ... |