From e3615abf0e9b87f574ddce53f94529d40762cecc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 07 六月 2024 17:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

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

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index faf61b2..d0cfb09 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1302,6 +1302,7 @@
                     return;
                 }
                 uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
+                return;
             }
 
             //濮旀墭淇� 鍔犲噺淇濅紒涓氱缃�
@@ -1326,6 +1327,7 @@
                     return;
                 }
                 uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
+                return;
             }
 
 
@@ -1340,6 +1342,7 @@
                     return;
                 }
                 uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
+                return;
             }
 
 
@@ -1359,6 +1362,7 @@
                     return;
                 }
                 uploadUnionChangeSignedFileDo(unionChange,fileUrl,path+fileUrl);
+                return;
             }
 
 
@@ -2737,6 +2741,7 @@
                 .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                 .isNull(ApplyDetail::getFromId)
                 .eq(ApplyDetail::getApplyId,model.getId())
+                .orderByAsc(ApplyDetail::getId)
         );
         model.setApplyDetailList(applyDetailList);
         return model;

--
Gitblit v1.9.3