// 我的名片

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMyNameCardViewController.swift

@@ -259,18 +259,38 @@ extension YHMyNameCardViewController {
             model2.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model2)
 
-            let model3 = YHUserNameCardInfo()
-            model3.type = .education
-            model3.isCurrentUser = self.isCurrentUser
-            model3.updateModel(self.viewModel.nameCardInfo)
-            self.cardInfoArr.append(model3)
-
-            let model4 = YHUserNameCardInfo()
-            model4.type = .workExperience
-            model4.isCurrentUser = self.isCurrentUser
-            model4.updateModel(self.viewModel.nameCardInfo)
-            self.cardInfoArr.append(model4)
-
+            if !self.isCurrentUser {
+                if !self.viewModel.nameCardInfo.isHiddenEducation {
+                    let model3 = YHUserNameCardInfo()
+                    model3.type = .education
+                    model3.isCurrentUser = self.isCurrentUser
+                    model3.updateModel(self.viewModel.nameCardInfo)
+                    self.cardInfoArr.append(model3)
+                }
+            } else {
+                let model3 = YHUserNameCardInfo()
+                model3.type = .education
+                model3.isCurrentUser = self.isCurrentUser
+                model3.updateModel(self.viewModel.nameCardInfo)
+                self.cardInfoArr.append(model3)
+            }
+            
+            if !self.isCurrentUser {
+                if !self.viewModel.nameCardInfo.isHiddenWorkExperience {
+                    let model4 = YHUserNameCardInfo()
+                    model4.type = .workExperience
+                    model4.isCurrentUser = self.isCurrentUser
+                    model4.updateModel(self.viewModel.nameCardInfo)
+                    self.cardInfoArr.append(model4)
+                }
+            } else {
+                let model4 = YHUserNameCardInfo()
+                model4.type = .workExperience
+                model4.isCurrentUser = self.isCurrentUser
+                model4.updateModel(self.viewModel.nameCardInfo)
+                self.cardInfoArr.append(model4)
+            }
+            
             let model5 = YHUserNameCardInfo()
             model5.type = .honor
             model5.isCurrentUser = self.isCurrentUser

galaxy/galaxy/Classes/Modules/Community(社区)/M/YHMatchUserInfo.swift

@@ -95,8 +95,16 @@ class YHUserNameCardInfo: SmartCodable {
     
     // 自定义属性
     var type:YHNameCardInfoType = .unknown
-    var isHiddenEducation = false
-    var isHiddenWorkExperience = false
+    var isHiddenEducation : Bool {
+        get {
+            return self.authorization.educationExperience != 2
+        }
+    }
+    var isHiddenWorkExperience: Bool {
+        get {
+            return self.authorization.educationExperience != 2
+        }
+    }
     var isCurrentUser = false
     
     required init() {