【电子报聘】报聘经纪人所属体系规则优化13

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

@@ -112,11 +112,18 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
         List<MdPractitionerHiringApproveSteps> stepsList = systemConfigService.findHiringApproveStepsAll();
         List<MdPractitionerHiringApproveSteps> stepsList = systemConfigService.findHiringApproveStepsAll();
         // 当前经纪人的报聘职级
         // 当前经纪人的报聘职级
         AclPractitionerHiringMembership hiringMemberShip = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
         AclPractitionerHiringMembership hiringMemberShip = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+        String mdDropOptionName = hiringMemberShip.getMdDropOptionName();
+        // 审批的体系负责人
+        String subsystemOwnerName = "";
+        if (hiringMemberShip.getApprovedBy() != null) {
+            AclPractitioner approvedBy = aclPractitionerDALService.findPractitionerById(hiringMemberShip.getApprovedBy());
+            subsystemOwnerName = (approvedBy != null) ? approvedBy.getName() : "";
+        }
 
 
         HiringApproveRecords record;
         HiringApproveRecords record;
         for (MdPractitionerHiringApproveSteps step : stepsList) {
         for (MdPractitionerHiringApproveSteps step : stepsList) {
             // S2前2步不用审批
             // S2前2步不用审批
-            if (Long.valueOf("30").equals(hiringMemberShip.getMdDropOptionId())
+            if ((mdDropOptionName.indexOf("S2")>=0 || mdDropOptionName.indexOf("S3")>=0)
                     && (step.getStepSeq() == 1 || step.getStepSeq() == 2)
                     && (step.getStepSeq() == 1 || step.getStepSeq() == 2)
             ) {
             ) {
                 continue;
                 continue;
@@ -141,7 +148,7 @@ public class PractitionerHiringDALServiceImpl implements PractitionerHiringDALSe
                 if ("mentor".equals(step.getApproveRole())) {
                 if ("mentor".equals(step.getApproveRole())) {
                     obj.setApprovingPractitionerName(hiringMemberShip.getMentor());
                     obj.setApprovingPractitionerName(hiringMemberShip.getMentor());
                 } else if ("subsystemOwner".equals(step.getApproveRole())) {
                 } else if ("subsystemOwner".equals(step.getApproveRole())) {
-                    obj.setApprovingPractitionerName(hiringMemberShip.getSubsystemOwner());
+                    obj.setApprovingPractitionerName(subsystemOwnerName);
                 } else {
                 } else {
                     String names = aclUserDalService.selectNamesByMobileNos(step.getAppointedApprovePractitioners());
                     String names = aclUserDalService.selectNamesByMobileNos(step.getAppointedApprovePractitioners());
                     obj.setApprovingPractitionerName(names);
                     obj.setApprovingPractitionerName(names);