From 79ad252cb59f9f4357806e69bd6ad02d81b167bc Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 7 Nov 2024 14:18:42 +0800
Subject: [PATCH] 1

---
 .../booking/controller/admin/DlRepairBookingController.java     | 1 +
 .../module/tickets/service/impl/DlRepairTicketsServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java
index 2d57cd29..c669f3ac 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/controller/admin/DlRepairBookingController.java
@@ -108,6 +108,7 @@ public class DlRepairBookingController {
         Map<String,String> repairTypeMap = repairTypeList.stream().collect(Collectors.toMap(DictDataRespDTO::getValue,DictDataRespDTO::getLabel));
         List<DlRepairBooking> respVOList = dlRepairBookingService.list(new LambdaQueryWrapper<DlRepairBooking>()
                 .eq(DlRepairBooking::getUserId,userId)
+                .isNull(DlRepairBooking::getTicketsId)
                 .orderByDesc(DlRepairBooking::getBookingTime));
         List<DlRepairBookingRespVO> rtnList = new ArrayList<>();
         for(DlRepairBooking booking:respVOList){
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index 440ec04a..b03f8d97 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -1052,7 +1052,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             施工完成又分四种情况：阶段完成、完成并移交下一班组、完成并移交总检、完成工单，其中部分完成同开始施工、施工中的记录上传一致，只上传，不改变
           */
         // 消息生成
-        String message = createMessage(tickets.getNowRepairName(), tickets.getCarNo(), titem.getItemName(), respVO.getRecordType(), respVO.getFinishType(), respVO.getNextName());
+        String message = createMessage(tickets.getNowRepairName(), tickets.getCarNo(),null==titem?"":titem.getItemName(), respVO.getRecordType(), respVO.getFinishType(), respVO.getNextName());
         // 通知服务顾问
         // 如果员工完成了订单
         if (RecordTypeEnum.SGWCZJ.getCode().equals(respVO.getRecordType()) && "03".equals(respVO.getFinishType())) {