From f626a33be6931ce643d664c1c4985065083fa569 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 30 Jul 2024 10:43:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=2087679=20=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=88=90=E5=91=98--=E5=AF=BC=E5=85=A5--?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=AF=BC=E5=85=A5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemServiceImpl.java    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index a8d32242..09051891 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -673,6 +673,15 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         if (StringUtils.isBlank(workGroupId)) {
             throw new JeroBootException("工作组id不能为空 ！");
         }
+        // 获取工作组信息
+        PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
+        if (Objects.isNull(payWorkingGroup)) {
+            throw new JeroBootException("工作组不存在 ！");
+        }
+        String year = payWorkingGroup.getYear();
+        //判断用户是否能操作所选年份数据
+        AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
+
         StringBuilder msg = new StringBuilder();
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -772,11 +781,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
 //                    if(CollectionUtils.isEmpty(listContactsInfo)){
 //                        msg.append("excel中联系人不存在 ！");
 //                    }
-                    // 获取工作组信息
-                    PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(workGroupId);
-                    if (Objects.isNull(payWorkingGroup)) {
-                        msg.append("工作组不存在 ！");
-                    }
+
                     if (StringUtils.isBlank(msg)) {
 
                         // 校验预估到账日期
@@ -903,9 +908,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                             }
                         });
                         if (StringUtils.isBlank(msg)) {
-                            String year = payWorkingGroup.getYear();
-                            //判断用户是否能操作所选年份数据
-                            AnnualDataLocking annualDataLocking = annualDataLockingService.judgeUserYear(year);
+
                             // 拷贝企业，联系人
                             for (PayWorkingGroupSubItem payWorkingGroupSubItem : list) {
                                 setPayWorkingGroupSubItemAdd(payWorkingGroupSubItem, annualDataLocking);