Merge branch 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into qmas-1130

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

@@ -619,19 +619,30 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             let passport_issue_date_end_at = mainModel.certificates.passport.issue_date_end_at
             let nationality = mainModel.nationality
             let is_live_oversea_year = mainModel.is_live_oversea_year
-            if nationality.contains("中国-China") {
-                guard cn_identity_card_number.count == 18 else { return false }
-                guard cn_identity_card_issue_at.count > 0 else { return false }
-                guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
-                guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
-            }
-            if self.mainModel.is_handled == 1 {
+            let addressCountry = mainModel.address.country
+            if (nationality.contains("中国") && addressCountry.contains("中国")) || (nationality.contains("中国") && is_live_oversea_year == 0) {
+                if nationality.contains("中国-China") {
+                    guard cn_identity_card_number.count == 18 else { return false }
+                    guard cn_identity_card_issue_at.count > 0 else { return false }
+                    guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
+                    guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
+                }
                 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 }
-            }
-            if is_live_oversea_year == 1 || !nationality.contains("中国")  {
+            } else if nationality.contains("中国") && is_live_oversea_year == 1 {
+                if nationality.contains("中国-China") {
+                    guard cn_identity_card_number.count == 18 else { return false }
+                    guard cn_identity_card_issue_at.count > 0 else { return false }
+                    guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
+                    guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
+                }
+                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 }
+            } else {
                 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 }