电子报聘回退优化3

yd-api/src/main/java/com/yd/dal/service/practitioner/impl/PractitionerHiringDALServiceImpl.java

@@ -113,8 +113,13 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
             item.setLevelName(levelName);
             item.setLevelName(levelName);
         }
         }
 
 
+        // 如果已审核结束，则不需要手动创建未审批的流程
+        if ("0".equals(approveStatus)) {
+            return records;
+        }
+
         // 声明最终返回的List
         // 声明最终返回的List
-        List<HiringApproveRecords> resultList = new ArrayList<>();
+        List<HiringApproveRecords> resultList = new ArrayList<>(records);
         // 所有的审批流程
         // 所有的审批流程
         List<MdPractitionerHiringApproveSteps> stepsList = systemConfigService.findHiringApproveStepsAll();
         List<MdPractitionerHiringApproveSteps> stepsList = systemConfigService.findHiringApproveStepsAll();
         // 当前经纪人的报聘职级
         // 当前经纪人的报聘职级
@@ -127,8 +132,6 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
             subsystemOwnerName = (approvedBy != null) ? approvedBy.getName() : "";
             subsystemOwnerName = (approvedBy != null) ? approvedBy.getName() : "";
         }
         }
 
 
-        // 如果已审核结束，则不需要手动创建未审批的流程
-        if ("0".equals(approveStatus)) {
         for (MdPractitionerHiringApproveSteps step : stepsList) {
         for (MdPractitionerHiringApproveSteps step : stepsList) {
             // S2前2步不用审批
             // S2前2步不用审批
             if ((mdDropOptionName.indexOf("S2") >= 0 || mdDropOptionName.indexOf("S3") >= 0)
             if ((mdDropOptionName.indexOf("S2") >= 0 || mdDropOptionName.indexOf("S3") >= 0)
@@ -164,7 +167,6 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
                 resultList.add(obj);
                 resultList.add(obj);
             }
             }
         }
         }
-        }
         return resultList;
         return resultList;
     }
     }