// 行业显示

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHAddFriendCardCell.swift

@@ -47,10 +47,22 @@ class YHAddFriendCardCell: UITableViewCell {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             self.nameLabel.text = self.friendModel.username
-            self.professionalLabel.text = self.friendModel.position
             self.msgLabel.text = self.friendModel.verifyInfo
             self.signImgV.isHidden = !self.friendModel.isSign
             
+            var text1 = ""
+            var text1Arr:[String] = []
+            if !self.friendModel.position.isEmpty {
+                text1Arr.append(self.friendModel.position)
+            }
+            if !self.friendModel.industry.isEmpty {
+                text1Arr.append(self.friendModel.industry)
+            }
+            if text1Arr.count > 0 {
+                text1 = text1Arr.joined(separator: " | ")
+            }
+            self.professionalLabel.text = text1
+            
             self.scrollView.snp.updateConstraints { make in
                 let msgHeight = self.getHeight(text: self.friendModel.verifyInfo, font: self.msgLabel.font!, width: KScreenWidth-40.0*2)
                 make.height.equalTo(msgHeight >= 55.0 ? 52+12 : msgHeight+12)

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyFriendsCell.swift

@@ -20,9 +20,22 @@ class YHMyFriendsCell: UITableViewCell {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             self.nameLabel.text = self.friendModel.username
-            self.professionalLabel.text = self.friendModel.position
             self.detailLabel.text = self.friendModel.bio
             self.signImgV.isHidden = !self.friendModel.isSign
+            
+            var text1 = ""
+            var text1Arr:[String] = []
+            if !self.friendModel.position.isEmpty {
+                text1Arr.append(self.friendModel.position)
+            }
+            if !self.friendModel.industry.isEmpty {
+                text1Arr.append(self.friendModel.industry)
+            }
+            if text1Arr.count > 0 {
+                text1 = text1Arr.joined(separator: " | ")
+            }
+            self.professionalLabel.text = text1
+
         }
     }