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

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

@@ -284,6 +284,8 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
     private void setSomeAddress(Map<String, String> data, Long hiringBasicInfoId, AclPractitionerSubordinateSystem systermOwnerRecordSystem) {
         AclPractitionerHiringBasicInfo basicInfo = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
         AclPractitionerHiringMembership memberShip = membershipMapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+        String mdDropOptionName = memberShip.getMdDropOptionName();
+
         AclPractitioner systemOwner = aclPractitionerMapper.selectByPrimaryKey(systermOwnerRecordSystem.getOwnerPractitionerId());
         AclPractitioner mentor = aclPractitionerMapper.selectByPrimaryKey(memberShip.getMentorPractitionerId());
 
@@ -295,18 +297,18 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         data.put("secondPartyIDNo", basicInfo.getIdNo());
         StringBuffer secondResidentAddress = new StringBuffer();
         secondResidentAddress.append(basicInfo.getProvinceName()).append(basicInfo.getCityName());
-        data.put("secondPartyAddress", basicInfo.getResidentAddress());
+        data.put("secondPartyAddress", basicInfo.getResidentAddress().replace("null", ""));
         data.put("secondMobileNo", basicInfo.getMobileNo());
 
 
-        data.put("secondSubsystemOwner", systermOwnerRecordSystem.getName());
+        data.put("secondSubsystemOwner", systemOwner.getName());
         data.put("secondSubsystemSignature", memberShip.getSubsystemOwner());
         // 查团队长信息
         String systemOwnerIdNo = null;
         String systemOwnerMobile = null;
         StringBuffer systemOwnerAddress = new StringBuffer();
         if (systemOwner == null) {
-            if (Long.valueOf("30").equals(memberShip.getMdDropOptionId())) {
+            if (mdDropOptionName.indexOf("S2") >= 0 || mdDropOptionName.indexOf("S3") >= 0) {
                 systemOwnerIdNo = basicInfo.getIdNo();
                 systemOwnerMobile = basicInfo.getMobileNo();
                 systemOwnerAddress.append(basicInfo.getResidentAddress());
@@ -319,7 +321,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
             systemOwnerAddress.append(systemOwner.getProvinceName()).append(systemOwner.getCityName());
         }
         data.put("secondSubsystemIDNo", systemOwnerIdNo);
-        data.put("secondSubsystemAddress", systemOwnerAddress.toString());
+        data.put("secondSubsystemAddress", systemOwnerAddress.toString().replace("null", ""));
         data.put("secondSubsystemMobileNo", systemOwnerMobile);
 
         data.put("secondMentor", mentorName);
@@ -329,7 +331,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         if (mentor != null) {
             mentorAddress.append(mentor.getProvinceName()).append(mentor.getCityName());
         }
-        data.put("secondMentorAddress", mentorAddress.toString());
+        data.put("secondMentorAddress", mentorAddress.toString().replace("null", ""));
         data.put("secondMentorMobileNo", mentorMobile);
     }