导入版 修改

fhKeeper/formulahousekeeper/management-platform-import/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -587,14 +587,16 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
                         return msg;
                     }
                     expenseItem.setProjectId(project.get().getId());
-                    List<SubProject> subProjects = subProjectList.stream().filter(sl -> sl.getProjectId().equals(project.get().getId())).collect(Collectors.toList());
-                    Optional<SubProject> subProject = subProjects.stream().filter(s ->(StringUtils.isEmpty(s.getCode())?"":s.getCode()).equals(subCodeCell.getStringCellValue())
-                            || (StringUtils.isEmpty(s.getName())?"":s.getName()).equals(subCodeCell.getStringCellValue())).findFirst();
-                    if(!subProject.isPresent()){
-                        msg.setError("子项目["+subCodeCell.getStringCellValue()+"]不属于项目["+codeCell.getStringCellValue()+"]");
-                        return msg;
+                    if(subCodeCell!=null){
+                        List<SubProject> subProjects = subProjectList.stream().filter(sl -> sl.getProjectId().equals(project.get().getId())).collect(Collectors.toList());
+                        Optional<SubProject> subProject = subProjects.stream().filter(s ->(StringUtils.isEmpty(s.getCode())?"":s.getCode()).equals(subCodeCell.getStringCellValue())
+                                || (StringUtils.isEmpty(s.getName())?"":s.getName()).equals(subCodeCell.getStringCellValue())).findFirst();
+                        if(!subProject.isPresent()){
+                            msg.setError("子项目["+subCodeCell.getStringCellValue()+"]不属于项目["+codeCell.getStringCellValue()+"]");
+                            return msg;
+                        }
+                        expenseItem.setSubProjectId(subProject.get().getId());
                     }
-                    expenseItem.setSubProjectId(subProject.get().getId());
                     expenseItem.setExpenseId(expenseSheet.getId());
                     if(happenDateCell!=null && !happenDateCell.toString().trim().equals("")){
                         LocalDate happenDate = Instant.ofEpochMilli(happenDateCell.getDateCellValue().getTime())