From 37e2d3c73caac445d1d8e229747b439e3719c13b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 03 六月 2025 17:04:13 +0800
Subject: [PATCH] zjh20250603

---
 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 6da640c..756d268 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
@@ -41,6 +41,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -178,7 +179,7 @@
     @ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
     public TableDataInfo list(TjReservation tjReservation) {
         startPage();
-        tjReservation.setIsExpire(2);
+       if(tjReservation.getIsExpire()==null) tjReservation.setIsExpire(2);
         List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
 //        if(null !=list && list.size()>0){
 //            for (TjReservation reservation : list) {

--
Gitblit v1.8.0