From 075aacde0f3faa637750c1addda2faa61ba55505 Mon Sep 17 00:00:00 2001
From: JyuHsin <729757837@qq.com>
Date: Mon, 9 Jun 2025 17:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TheRapyRecuperationEnrollServiceImpl.java    |  9 ++++++---
 .../therapyRecuperation/baseManagement.html      | 13 +++++--------
 .../mobile/therapyRecuperation/lineInfo.html     | 16 +++++-----------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java
index d54d76a..6aa92c1 100644
--- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java
@@ -793,10 +793,13 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl<TheRapyR
 			TheRapyRecuperationTravelAgency currentTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, currentManagement.getTravelAgencyId());
 
 			TheRapyRecuperationBaseManagement lastManagement = dao().fetch(TheRapyRecuperationBaseManagement.class, lastEnroll.getTakePartInBaseManagementId());
-			TheRapyRecuperationTravelAgency lastTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, lastManagement.getTravelAgencyId());
-			if (!Objects.equals(currentTravelAgency.getId(), lastTravelAgency.getId())) {
-				return Map.of(false, "当前报名酒店的旅行社与上次出行不一致");
+			if(lastManagement != null) {
+				TheRapyRecuperationTravelAgency lastTravelAgency = dao().fetch(TheRapyRecuperationTravelAgency.class, lastManagement.getTravelAgencyId());
+				if (!Objects.equals(currentTravelAgency.getId(), lastTravelAgency.getId())) {
+					return Map.of(false, "当前报名酒店的旅行社与上次出行不一致");
+				}
 			}
+
 			//如果是一个，再判断天数
 			if (currentEnroll.getPlayDay() != null) {
 				if ((currentEnroll.getPlayDay() + lastEnroll.getPlayDay()) != 5) {
diff --git a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html
index 9fa68f2..f641c52 100644
--- a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html
+++ b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html
@@ -307,14 +307,11 @@ layout("/mobile/platform.html"){
         </van-button>
     </div>
     <div class="footer" v-else>
-        <template v-if="baseData.isNormal == 0 && baseData.isNormalFalse > 0">
-            <van-button @click="join" class="join">我要报名</van-button>
-        </template>
-        <template v-else>
-            <van-button v-if="moment().unix() >= moment(configData.fragmentStartTime).unix() && moment().unix() <= moment(configData.fragmentEndTime).unix()"
-                        @click="join" class="join">我要报名</van-button>
-            <van-button v-if="moment().unix() > moment(configData.fragmentEndTime).unix()" class="join">报名结束</van-button>
-        </template>
+        <van-button v-if="moment().unix() >= moment(configData.fragmentStartTime).unix() && moment().unix() <= moment(configData.fragmentEndTime).unix()" @click="join"
+                    class="join">{{ enrollId ? '修改报名' : '我要报名' }}
+        </van-button>
+        <van-button v-if="moment().unix() > moment(configData.fragmentEndTime).unix()" class="join">报名结束
+        </van-button>
     </div>
 
     <!--报名弹出框-->
diff --git a/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html b/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html
index 1f2e648..9fb1b86 100644
--- a/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html
+++ b/src/main/resources/views/mobile/therapyRecuperation/lineInfo.html
@@ -316,17 +316,11 @@ layout("/mobile/platform.html"){
 
         <!--底部报名按钮-->
         <div class="footer" v-if="fromUrlByMy != 'edit'">
-            <template v-if="lineData.isNormal == 0 && lineData.isNormalFalse > 0">
-                <van-button @click="join" class="join">我要报名</van-button>
-            </template>
-            <template v-else>
-                <van-button v-if="moment().unix() >= moment(configData.implodeStartTime).unix() && moment().unix() <= moment(configData.implodeEndTime).unix()"
-                            @click="join"
-                            class="join">我要报名
-                </van-button>
-                <van-button v-if="moment().unix() > moment(configData.implodeEndTime).unix()" class="join">报名结束
-                </van-button>
-            </template>
+            <van-button v-if="moment().unix() >= moment(configData.implodeStartTime).unix() && moment().unix() <= moment(configData.implodeEndTime).unix()" @click="join"
+                        class="join">{{ enrollId ? '修改报名' : '我要报名' }}
+            </van-button>
+            <van-button v-if="moment().unix() > moment(configData.implodeEndTime).unix()" class="join">报名结束
+            </van-button>
         </div>
     </template>