From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
index 52fc9ef..0c6eb9d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java
@@ -116,11 +116,10 @@
MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
- .leftJoin(Bikes.class,Bikes::getId,BikeRepair::getBinkeId)
- .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId);
+ .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
queryWrapper.selectAll(BikeRepair.class)
.selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
- .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)
+ .selectAs(BikeRepair::getBinkeId,BikeRepairDTO::getBikeCode)
.selectAs(BaseParam::getName,BikeRepairDTO::getBikeTypeName);
queryWrapper.like(StringUtils.isNotEmpty(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
.like(StringUtils.isNotEmpty(pageWrap.getModel().getBikeCode()),Bikes::getCode,pageWrap.getModel().getBikeCode())
--
Gitblit v1.9.3