主申请人信息逻辑修改

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -116,6 +116,15 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             return [section, section1]
         } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
             return [section, section2]
+        } else if nationality.contains("中国") {
+            if is_live_oversea_year == 1 {
+                if mainModel.is_handled == 1 {
+                    return [section1, section2]
+                }
+                return [section2]
+            } else {
+                return [section1]
+            }
         } else {
             return [section2]
         }
@@ -340,6 +349,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             mainModel.address.foreign = item.message ?? ""
         case .id33:
             mainModel.is_live_oversea_year = item.value?.first?.int ?? 0
+            mainModel.is_handled = 0
         case .id34:
             mainModel.birth_place.foreign = item.message ?? ""
         case .id35:
@@ -640,6 +650,19 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
                 guard passport_issue_at.count > 0 else { return false }
                 guard passport_issue_date_start_at.count > 0 else { return false }
                 guard passport_issue_date_end_at.count > 0 else { return false }
+            } else if nationality.contains("中国") {
+                if is_live_oversea_year == 1 {
+                    guard passport_number.count > 0 else { return false }
+                    guard passport_issue_at.count > 0 else { return false }
+                    guard passport_issue_date_start_at.count > 0 else { return false }
+                    guard passport_issue_date_end_at.count > 0 else { return false }
+                }
+                if mainModel.is_handled == 1 {
+                    guard hk_macao_pass_number.count > 0 else { return false }
+                    guard hk_macao_pass_issue_at.count > 0 else { return false }
+                    guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
+                    guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
+                }
             } else {
                 guard passport_number.count > 0 else { return false }
                 guard passport_issue_at.count > 0 else { return false }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperiencePositionViewViewController.swift

@@ -186,7 +186,7 @@ extension YHWorkExperiencePositionViewViewController: UITableViewDelegate, UITab
                 guard let self = self else { return }
                 self.viewModel.updateModel(model)
                 let id = model.id
-                if id != .id1 && id != .id2 && id != .id6 && id != .id10 {
+                if id != .id1 && id != .id2 && id != .id6 && id != .id10 && id != .id11 {
                     self.updateDataSource()
                 }
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceListTableViewCell.swift

@@ -86,13 +86,13 @@ class YHWorkExperienceListTableViewCell: UITableViewCell {
             label.font = UIFont.PFSC_R(ofSize: 12)
             label.text = "从获得有效学位（学士学位或以上）后第一份工作开始，直至最近一份工作"
             label.textColor = UIColor.labelTextColor2
+            label.numberOfLines = 0
             return label
         }()
         centerView.addSubview(subTitleLabel)
         subTitleLabel.snp.makeConstraints { make in
             make.left.equalTo(20)
             make.top.equalTo(50)
-            make.height.equalTo(20)
             make.right.equalTo(-20)
         }