高才我的方案bug修复

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -1278,7 +1278,6 @@
 		04307BAF2D215D1C00ED8E8D /* YHRecommendedLiveHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRecommendedLiveHeader.swift; sourceTree = "<group>"; };
 		04307BB32D21623300ED8E8D /* YHRecommendedAppointmentLiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRecommendedAppointmentLiveView.swift; sourceTree = "<group>"; };
 		04307BB52D2180C300ED8E8D /* YHRecommendedOnLiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRecommendedOnLiveView.swift; sourceTree = "<group>"; };
-		045C09A12D12C2A800BD2DC0 /* YHGCMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMineSchemeViewController.swift; sourceTree = "<group>"; };
 		045C0A142D12CA5E00BD2DC0 /* YHBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; };
 		045C0A152D12CA5E00BD2DC0 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
 		045C0A162D12CA5E00BD2DC0 /* YHNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNavigationController.swift; sourceTree = "<group>"; };
@@ -6484,7 +6483,6 @@
 		04E86E212B81E9FA00A35F4B /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
-				045C09A12D12C2A800BD2DC0 /* YHGCMineSchemeViewController.swift */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/C/YHGCMineSchemeViewController.swift

@@ -117,16 +117,32 @@ extension YHGCMineSchemeViewController {
             if success == true {
                 guard let model = self.reqSchemeVM.schemeModel else { return }
 
-                let industry = model.industry.defaultStringIfEmpty()
+                let industry = model.industry
+                if !industry.isEmpty {
                     let model1 = YHScemeItemModel(title: "职业界别", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：\n" + industry, lightMessage: industry, subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。", lightFont: UIFont.PFSC_B(ofSize: 16))
-                let contentStr = model.content.reduce("") { partialResult, current in
-                    partialResult.count > 0 ? partialResult + "\n" + current : partialResult + current
+                    self.dataSource?.append(model1)
                 }
-                let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "按照您填报的学历信息， 证明文件如下：\(contentStr)")
-                self.dataSource = [model1, model2]
+                
+                let contentStr: String
+                if model.content.count > 1 {
+                    contentStr = model.content.enumerated().reduce("") { partialResult, current in
+                        let (index, content) = current
+                        return partialResult + "\n" + "（\(index + 1)）" + content
+                    }
+                } else if model.content.count > 0 {
+                    contentStr = model.content.reduce("") { partialResult, current in
+                        return partialResult + "\n" + current
+                    }
+                } else {
+                    contentStr = ""
+                }
+                
+                let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看，请您在1-2周内准备好文件并上传：", lightMessage: "1-2周内", subMessage: "按照您填报的收入信息， 证明文件如下：\(contentStr)")
+                self.dataSource?.append(model2)
                 self.tableView.reloadData()
                 let type = YHGCApplicationType(rawValue: model.application_type) ?? .typeA
-                self.headView.update(type: type, name: model.username.defaultStringIfEmpty())
+                let name = model.user_name.isEmpty ? "--" : "尊敬的\(model.user_name)"
+                self.headView.update(type: type, name: name)
             } else {
                 YHHUD.flash(message: error?.errorMsg ?? "请求出错")
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/M/YHGCMySchemeModel.swift

@@ -12,7 +12,7 @@ import SmartCodable
 class YHGCMySchemeModel: SmartCodable {
     var application_type: Int = 0
     var industry : String = ""
-    var username : String = ""
+    var user_name : String = ""
     var sex: Int = 0
     var content: [String] = []
     var certificate_skip_status: Bool = false