liugc 10 месяцев назад
Родитель
Сommit
1f47d4bba7

+ 1 - 1
app/common/model/master_worker/EngineerSettlementPermanently.php

@@ -40,7 +40,7 @@ class EngineerSettlementPermanently extends BaseModel
 
     public function salaryItemPermanently()
     {
-        return $this->hasMany(SalaryItemPermanently::class, 'permanently_settlement_id', 'id')->append(['term_text']);
+        return $this->hasMany(SalaryItemPermanently::class, 'permanently_settlement_id', 'id')->with(['workerInfo'])->append(['term_text']);
     }
 
 }

+ 4 - 1
app/common/model/master_worker/SalaryItemPermanently.php

@@ -32,7 +32,10 @@ class SalaryItemPermanently extends BaseModel
     
     protected $name = 'salary_item_permanently';
 
-
+    public function workerInfo()
+    {
+        return $this->hasOne(MasterWorkerInfo::class, 'worker_id', 'master_worker_id');
+    }
     public function getTermTextAttr($value,$data):string
     {
         $dictData = DictData::whereIn('type_value', 'salary_item')->column('name','value');