From 0e0dfda02355cc17305b5a3d2680e82095dd411e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 14 五月 2025 11:36:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 034365e..ed874fd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -445,7 +445,10 @@
                             .eq(ApplyDetail::getApplyId,insuranceApply.getId())
                             .eq(ApplyDetail::getIdcardNo,model.getIdCard())
                          /*   .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))*/
-                            .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
+                            .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3))
+                            .orderByAsc(ApplyDetail::getEndTime)
+                            .last(" limit 1 ")
+            );
             if(detail == null){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" + model.getName()+model.getIdCard() + "銆戦潪鍦ㄤ繚浜哄憳锛屾棤娉曡繘琛岃鎿嶄綔");
             }

--
Gitblit v1.9.3