From beca2c01d4f104ef145bbee9fa91aac2957ef360 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 29 十二月 2023 18:02:00 +0800
Subject: [PATCH] zjh 2023/12/29--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 11 ++++++++++-
1 files changed, 10 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 d8c96a4..996055d 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
@@ -509,7 +509,16 @@
TjReservation tjReservation = tjReservationService.selectTjReservationById(id);
if (null != tjReservation) {
if (null != tjReservation.getPacId()) {
- tjReservation.setPacName(packageService.getById(tjReservation.getPacId()).getPacName());
+ TjPackage aPackage = packageService.getById(tjReservation.getPacId());
+ if(null !=aPackage){
+ tjReservation.setPacName(aPackage.getPacName());
+ }
+ TjDwDept dwDept = dwDeptService.getById(tjReservation.getPacId());
+
+ if(null !=dwDept){
+ tjReservation.setPacName(dwDept.getDwName());
+ }
+
}
if (null != tjReservation.getProIds()) {
List<String> proNames = new ArrayList<>();
--
Gitblit v1.8.0