From 1ba00bbbd771572c06f774f48ec748434407d399 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 02 七月 2025 11:06:11 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
index 5e51ccc..cbc1d52 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundtaxServiceImpl.java
@@ -15,10 +15,12 @@
import com.ruoyi.project.service.IServiceFunddetailService;
import com.ruoyi.project.service.IServiceFundtaxService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Comparator;
import java.util.List;
/**
@@ -176,6 +178,10 @@
serviceFund.setFundTaxId(fundTaxVO.getFundTaxId());
serviceFund.setDel_flag(0);
List<ServiceFund> serviceFunds = serviceFundService.selectServiceFundList(serviceFund);
+ if (CollectionUtils.isEmpty(serviceFunds)) {
+ //鏍规嵁id鎺掑簭锛堝崌搴忥級
+ serviceFunds.sort(Comparator.comparing(ServiceFund::getId));
+ }
for (ServiceFund serviceFund1 : serviceFunds) {
ServiceFunddetail serviceFunddetail = new ServiceFunddetail();
serviceFunddetail.setFundid(serviceFund1.getId());
--
Gitblit v1.9.3