excel 删除空行 编码、关联编码循环嵌套

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/MedicalInsRuleProjectServiceImpl.java

@@ -342,10 +342,9 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
                             throw new JeecgBootException("数据关联项目编号为空，关联项目编号必填，请检查！");
                         }
                     }
-
-                    hasCode = projectCode.contains("\n");
-                    hasCorrelationCode = correlationProjectCode.contains("\n");
-                    if(hasCode||hasCorrelationCode){
+                    hasCode = projectCode == null ? false : projectCode.contains("\n");
+                    hasCorrelationCode = correlationProjectCode == null ? false : correlationProjectCode.contains("\n");
+                    if (hasCode || hasCorrelationCode) {
                         List<String> codeArr = Arrays.asList(projectCode.split("\n"));
                         List<String> nameArr = Arrays.asList(item.getProjectName().split("\n"));
                         List<MedicalInsRuleProject> codeList = new ArrayList<>();
@@ -354,7 +353,7 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
                             String code = codeArr.get(i);
                             String name = nameArr.get(i);
                             MedicalInsRuleProject project = new MedicalInsRuleProject();
-                            BeanUtils.copyProperties(item,project);
+                            BeanUtils.copyProperties(item, project);
                             project.setProjectCode(code);
                             project.setProjectName(name);
                             codeList.add(project);
@@ -423,7 +422,7 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
                     if (!CollectionUtils.isEmpty(updateList)) {
                         updateNumber = updateList.size();
                         this.updateBatchById(updateList, 500);
-                        if(fieldList.contains(MEDICALDIAGNOSECODE) ||fieldList.contains(CORRELATIONMEDICALDIAGNOSECODE)) {
+                        if (fieldList.contains(MEDICALDIAGNOSECODE) || fieldList.contains(CORRELATIONMEDICALDIAGNOSECODE)) {
                             Integer finalId2 = id;
                             updateList.stream().forEach(it -> {
                                 if (StringUtils.hasText(it.getMedicalDiagnoseCode())) {
@@ -456,7 +455,7 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
                     //                    this.saveBatch(instalList, 500);
 //                    insertService.apply(instalList, 500);
                     this.saveBatch(instalList, 500);
-                    if(fieldList.contains(MEDICALDIAGNOSECODE) ||fieldList.contains(CORRELATIONMEDICALDIAGNOSECODE)) {
+                    if (fieldList.contains(MEDICALDIAGNOSECODE) || fieldList.contains(CORRELATIONMEDICALDIAGNOSECODE)) {
                         Integer finalId1 = id;
                         instalList.stream().forEach(it -> {
                             if (StringUtils.hasText(it.getMedicalDiagnoseCode())) {
@@ -500,13 +499,12 @@ public class MedicalInsRuleProjectServiceImpl extends ServiceImpl<MedicalInsRule
     }
 
 
-
     private static List<MedicalInsRuleProject> generateDataRecords(List<MedicalInsRuleProject> projectCodesAndNames, List<MedicalInsRuleProject> correlationProjectCodesAndNames) {
         List<MedicalInsRuleProject> resultList = new ArrayList<>();
         for (MedicalInsRuleProject project : projectCodesAndNames) {
             for (MedicalInsRuleProject relatedProject : correlationProjectCodesAndNames) {
                 MedicalInsRuleProject result = new MedicalInsRuleProject();
-                BeanUtils.copyProperties(project,result);
+                BeanUtils.copyProperties(project, result);
                 result.setCorrelationProjectCode(relatedProject.getCorrelationProjectCode());
                 result.setCorrelationProjectName(relatedProject.getCorrelationProjectName());
                 resultList.add(result);