15555599100 5 年 前
コミット
8b76c5c9f7

+ 14 - 20
HappyJob/HappyJob/CClass/Me_我/Salary_薪资查询/View/HJSalarySheetView.m

@@ -67,50 +67,44 @@
             make.height.mas_equalTo(58);
         }];
         
+        [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
+            
+            make.top.equalTo(self.companyView.mas_bottom).offset(0);
+            make.left.right.equalTo(self).offset(0);
+            make.height.mas_equalTo(58);
+        }];
+        
         
         //判断是否添加发放来源
-        if (data[kHJSalaryKeySourceCompanyName][kHJSalaryKeyInnerValue]) {
+        if ([data[kHJSalaryKeySourceCompanyName][kHJSalaryKeyInnerValue] length] > 0) {
             
             [self addSubview:self.sourceView];
             
             [self.sourceView mas_makeConstraints:^(MASConstraintMaker *make) {
                 
-                make.top.equalTo(self.companyView.mas_bottom).offset(0);
+                make.top.equalTo(self.nameView.mas_bottom).offset(0);
                 make.left.right.equalTo(self).offset(0);
                 make.height.mas_equalTo(58);
             }];
             
-            
-            [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
+            self.sourceView.contentLabel.text = data[kHJSalaryKeySourceCompanyName][kHJSalaryKeyInnerValue];
+            [self.workNumberView mas_makeConstraints:^(MASConstraintMaker *make) {
                 
                 make.top.equalTo(self.sourceView.mas_bottom).offset(0);
                 make.left.right.equalTo(self).offset(0);
                 make.height.mas_equalTo(58);
             }];
-            
-            self.sourceView.contentLabel.text = data[kHJSalaryKeySourceCompanyName][kHJSalaryKeyInnerValue];
-            
         }
         else
         {
-            
-            [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
-
-                make.top.equalTo(self.companyView.mas_bottom).offset(0);
+            [self.workNumberView mas_makeConstraints:^(MASConstraintMaker *make) {
+                
+                make.top.equalTo(self.nameView.mas_bottom).offset(0);
                 make.left.right.equalTo(self).offset(0);
                 make.height.mas_equalTo(58);
             }];
         }
         
-       
-        
-        [self.workNumberView mas_makeConstraints:^(MASConstraintMaker *make) {
-            
-            make.top.equalTo(self.nameView.mas_bottom).offset(0);
-            make.left.right.equalTo(self).offset(0);
-            make.height.mas_equalTo(58);
-        }];
-        
         self.monthView.contentLabel.text = data[kHJSalaryKeyMonth][kHJSalaryKeyInnerValue];
         self.companyView.contentLabel.text = data[kHJSalaryKeyCompanyName][kHJSalaryKeyInnerValue];
         self.nameView.contentLabel.text = data[kHJSalaryKeyEmployeeName][kHJSalaryKeyInnerValue];