From 28a07b5b768096a2c75b55c440b8afd0b50b3f0b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 16:55:35 +0800
Subject: [PATCH] a
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
index 403fd5c..9b0343f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java
@@ -116,12 +116,12 @@
IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- queryWrapper.orderByDesc(Bikes::getSiteId,Bikes::getLockId);
+ queryWrapper.orderByAsc(Bikes::getSiteId,Bikes::getLockId);
queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
.leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
- .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
+ .like( pageWrap.getModel().getLockId() !=null,Bikes::getLockId,pageWrap.getModel().getLockId())
.ne(Bikes::getLockId,collect.get(Constants.FORCE_BACK_LOCK).getCode())
.ne(Bikes::getSiteId,collect.get(Constants.FORCE_BACK_SITE).getCode())
.isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
--
Gitblit v1.9.3