Merge remote-tracking branch 'origin/release/2.8.3.2306.01' into release/2.8.3.2306.01

src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java

@@ -410,6 +410,22 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
                     .salaryItems(items)
                     .sortedIndex(groupPO.getSortedIndex()).build() );
         }
+        // 未分类
+        List<SalarySobItemPO> noGroupItems = salarySobItemPOMap.getOrDefault(0L, Collections.emptyList());
+        if(CollectionUtils.isNotEmpty(noGroupItems)){
+            List<SalaryAcctImportFieldDTO.ImportFieldDTO> items = noGroupItems.stream()
+                    .map(salarySobItemPO ->SalaryAcctImportFieldDTO.ImportFieldDTO.builder()
+                            .salaryItemId(salarySobItemPO.getSalaryItemId())
+                            .salaryItemName(Optional.ofNullable(salaryItemMap.get(salarySobItemPO.getSalaryItemId())).map(SalaryItemPO::getName).orElse(StringUtils.EMPTY))
+                            .build())
+                    .collect(Collectors.toList());
+
+            itemsByGroup.add(SalaryAcctImportFieldDTO.ImportFieldByGroupDTO.builder()
+                    .salarySobItemGroupId(0L)
+                    .salarySobItemGroupName("未分类")
+                    .salaryItems(items)
+                    .sortedIndex(itemsByGroup.size()).build());
+        }
 
 //        // 薪资项目中的公式项
 //        List<SalaryAcctImportFieldDTO.ImportFieldDTO> formulaItems = salaryItems.stream()