From a5da0116cb9768a3cca5ee69313d6b4dca9d6ca9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 07 十一月 2023 16:10:40 +0800
Subject: [PATCH] # 导出字段调整 登陆提示
---
server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 779b712..3c939c0 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,7 +116,7 @@
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())
@@ -125,6 +125,7 @@
.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)
+ .eq(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode,"")
.isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode)
.ne(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode,"");
queryWrapper.selectAll(Bikes.class)
--
Gitblit v1.9.3