From ac0dd084332a6fad4ff7dc15ed4f8984d611a91f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 三月 2025 15:39:52 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index 2c5ced4..e380400 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -367,6 +367,7 @@
queryWrapper.selectAll(Cars.class);
queryWrapper.selectAs(Member::getType,Cars::getMemberType);
queryWrapper.selectAs(Member::getName,Cars::getMemberName);
+ queryWrapper.selectAs(Member::getIsdeleted,Cars::getMemberDeleted);
queryWrapper.selectAs(SystemUser::getRealname,Cars::getEditorName);
queryWrapper.selectAs(Member::getPhone,Cars::getMemberPhone);
queryWrapper.selectAs(Member::getSex,Cars::getMemberSex);
@@ -423,6 +424,9 @@
cars.setGroupCateName(StringUtils.defaultString(cars.getCatePName(),"") + "/" + StringUtils.defaultString(cars.getCateName(),""));
}
cars.setParkBookList(getParkbookListByCode(cars,parkBooks));
+ if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
+ cars.setMemberId(null);
+ }
}
}
return PageData.from(result);
@@ -460,6 +464,7 @@
.leftJoin(Parks.class,Parks::getId,ParkBook::getParkId);
wrapper.selectAs(ParkBook::getCarCode,CarsDTO::getCode)
.selectAs(ParkBook::getParkId,CarsDTO::getParkId)
+ .selectAs(Member::getIsdeleted,CarsDTO::getMemberDeleted)
.selectAs(ParkBook::getRemark,CarsDTO::getRemark)
.selectAs(Parks::getName,CarsDTO::getParkName)
.selectAs(ParkBook::getMemberId,CarsDTO::getMemberId)
@@ -472,7 +477,13 @@
.selectAs(ParkBook::getCreateDate,CarsDTO::getCreateDate);
wrapper.orderByDesc(ParkBook::getCreateDate);
IPage<CarsDTO> carsDTOIPage = parkBookJoinMapper.selectJoinPage(page, CarsDTO.class, wrapper);
-
+ if(carsDTOIPage!=null && carsDTOIPage.getRecords()!=null && carsDTOIPage.getRecords().size()>0){
+ for(CarsDTO cars :carsDTOIPage.getRecords()){
+ if(Constants.equalsInteger(cars.getMemberDeleted(),Constants.ONE)){
+ cars.setMemberId(null);
+ }
+ }
+ }
return PageData.from(carsDTOIPage);
}
--
Gitblit v1.9.3