From ecd99537faa2214f94a43935911ca937361b5d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 27 Sep 2024 11:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=AE=E5=8A=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AEnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VariableArchiveServiceImpl.java      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java b/src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java
index b008273c6..af4c29ef5 100644
--- a/src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/VariableArchiveServiceImpl.java
@@ -1,5 +1,6 @@
 package com.engine.salary.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.cloudstore.eccom.pc.table.WeaTableColumn;
 import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
@@ -220,7 +221,7 @@ public class VariableArchiveServiceImpl extends Service implements VariableArchi
                 .employeeId(saveParam.getEmployeeId())
                 .taxAgentId(saveParam.getTaxAgentIds())
                 .salaryMonth(saveParam.getSalaryMonthDate())
-                .creator(Long.valueOf(user.getUID()))
+                .creator((long) user.getUID())
                 .createTime(now)
                 .updateTime(now)
                 .deleteType(NumberUtils.INTEGER_ZERO)
@@ -230,20 +231,22 @@ public class VariableArchiveServiceImpl extends Service implements VariableArchi
 
         // 保存浮动薪资档案详细信息
         List<VariableArchiveItemPO> variableArchiveItemList = new ArrayList<>();
-        saveParam.getItemValueList().forEach(e -> {
-            variableArchiveItemList.add(VariableArchiveItemPO.builder()
-                    .id(IdGenerator.generate())
-                    .employeeId(saveParam.getEmployeeId())
-                    .variableArchiveId(variableArchivePO.getId())
-                    .variableItemId(e.getVariableItemId())
-                    .itemValue(e.getItemValue())
-                    .creator(Long.valueOf(user.getUID()))
-                    .createTime(now)
-                    .updateTime(now)
-                    .deleteType(NumberUtils.INTEGER_ZERO)
-                    .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
-                    .build());
-        });
+        if(CollectionUtil.isNotEmpty(saveParam.getItemValueList())){
+            saveParam.getItemValueList().forEach(e -> {
+                variableArchiveItemList.add(VariableArchiveItemPO.builder()
+                        .id(IdGenerator.generate())
+                        .employeeId(saveParam.getEmployeeId())
+                        .variableArchiveId(variableArchivePO.getId())
+                        .variableItemId(e.getVariableItemId())
+                        .itemValue(e.getItemValue())
+                        .creator((long) user.getUID())
+                        .createTime(now)
+                        .updateTime(now)
+                        .deleteType(NumberUtils.INTEGER_ZERO)
+                        .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY)
+                        .build());
+            });
+        }
 
         if (CollectionUtils.isNotEmpty(variableArchiveItemList)) {
             getVariableArchiveItemService(user).batchInsert(variableArchiveItemList);