处理 数据源的问题

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift

@@ -99,12 +99,15 @@ extension YHBasicInfoFillViewModel {
         
         do {
             //配偶
-            let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: dataModelForBasicInfo.spouse?.child_departure?.has ?? "", info: dataModelForBasicInfo.spouse?.child_departure?.info ?? "")
-            let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: dataModelForBasicInfo.spouse?.child_deny?.has ?? "", info: dataModelForBasicInfo.spouse?.child_deny?.info ?? "")
-            let arr = [model1,model2]
             
-            let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr)
-            arrData.append(sessionModel)
+            if let spouse = dataModelForBasicInfo.spouse {
+                let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: spouse.child_departure?.has ?? "", info: spouse.child_departure?.info ?? "")
+                let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: spouse.child_deny?.has ?? "", info: spouse.child_deny?.info ?? "")
+                let arr = [model1,model2]
+                
+                let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr)
+                arrData.append(sessionModel)
+            }
         }
         
         
@@ -128,11 +131,15 @@ extension YHBasicInfoFillViewModel {
         
         do {
             //家庭背景
-            let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: dataModelForBasicInfo.background?.background_member?.has ?? "", info: dataModelForBasicInfo.background?.background_member?.info ?? "",type: 1)
-            model1.model = dataModelForBasicInfo.background
-            let arr = [model1]
-            let sessionModel = YHBasicInfoSessionModel(sessionTitle: "家庭背景", arrQuestionItem: arr)
-            arrData.append(sessionModel)
+            
+            if let model = dataModelForBasicInfo.background {
+                let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: model.background_member?.has ?? "", info: model.background_member?.info ?? "",type: 1)
+                model1.model = model
+                let arr = [model1]
+                let sessionModel = YHBasicInfoSessionModel(sessionTitle: "家庭背景", arrQuestionItem: arr)
+                arrData.append(sessionModel)
+            }
+            
         }
         
         arrBasicInfoSessionDataForEdit = arrData
@@ -142,8 +149,8 @@ extension YHBasicInfoFillViewModel {
 extension YHBasicInfoFillViewModel {
     //获取基本资料信息
     func getBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
-//        createOrgBasiceInfoData()
-//        callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
+        //        createOrgBasiceInfoData()
+        //        callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
         
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.basicInfoApi
@@ -177,8 +184,6 @@ extension YHBasicInfoFillViewModel {
     //保存基本资料信息
     func saveBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi
-        
-//        let strUrl = "http://192.168.25.21:10087/" + "infoflow/basics/update_basics"
         let _ = YHNetRequest.postRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard self != nil else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -71,7 +71,7 @@ extension YHServiceCenterMainViewModel {
             
             arrContactList.removeAll()
             
-0            if json.code == 200 {
+            if json.code == 200 {
                 let dic = json.data
                 guard let resultModel = YHContactItemHoldModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
                     arrContactList = []