From 41fe09a16916522832b91bfe0eafa6e78c326ceb Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Fri, 10 May 2024 15:30:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=AF=BC=E5=85=A5=E5=88=86=E5=8F=B7=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20perf=EF=BC=9A=E5=85=BC=E5=AE=B9=E6=97=A7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=94=A8=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bms/controller/BmsSupplierController.java      |  4 ++--
 .../vtb/service/impl/VtbFundFlowServiceImpl.java   | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
index ab35d2a6..64fa89b7 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
@@ -1052,7 +1052,7 @@ public class BmsSupplierController {
             }
         }
         /** -------------------------------  校验负责人  ------------------------------------------------ */
-        List<String> userCodes = new ArrayList<>();
+        Set<String> userCodes = new HashSet<>();
         userCodes.addAll(
             saveList.stream().filter(a->StringUtils.hasText(a.getMainHeadCode()))
                     .map(a->Arrays.asList(a.getMainHeadCode().split(";")))
@@ -1073,7 +1073,7 @@ public class BmsSupplierController {
                         .map(a->Arrays.asList(a.getMinorHeadCodes().split(";")))
                         .flatMap(List::stream).collect(Collectors.toList())
         );
-        userCodes = userCodes.stream().distinct().collect(Collectors.toList());
+        userCodes = userCodes.stream().filter(StringUtils::hasText).collect(Collectors.toSet());
         List<SysUser> userList = new ArrayList<>();
         if(userCodes.size()>0){
             LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
index 6601b3f0..4416ed47 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
@@ -225,11 +225,19 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
                     subjectTotal = subjectTotal.add(fundFlow.getUsedAmount());
                 }
                 TbsActivitySubject currActivitySubject = null;
-                for (TbsActivitySubject activitySubject : activitySubjectList) {
-                    if(activitySubject.getSubjectId().equals(subjectId)){
-                        currActivitySubject = activitySubject;
+                //兼容历史数据start
+                if(activitySubjectList.size()==1 && fundFlowMapBySubject.keySet().size()==1){
+                    currActivitySubject = activitySubjectList.get(0);
+                }
+                //默认的匹配方式
+                else {
+                    for (TbsActivitySubject activitySubject : activitySubjectList) {
+                        if(activitySubject.getSubjectId().equals(subjectId)){
+                            currActivitySubject = activitySubject;
+                        }
                     }
                 }
+
                 TbsActivitySubject activitySubject = new TbsActivitySubject();
                 activitySubject.setId(currActivitySubject.getId());
                 activitySubject.setSubjectId(currActivitySubject.getSubjectId());