From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 61b2f1f..1cb65eb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -697,7 +697,8 @@
                 TjReservation reservation = tjReservationService.getById(id);
                 if (null != reservation && reservation.getIsExpire() == 2) {
                     if (tjReservationService.removeById(id)) {
-                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard()));
+                        transitionService.remove(new LambdaQueryWrapper<TbTransition>().eq(TbTransition::getCusId, reservation.getIdCard())
+                                .isNull(TbTransition::getTjNum));
                         taskService.removeTask(new TjReservationTask(id));
                     }
                 }

--
Gitblit v1.8.0