liugc 10 месяцев назад
Родитель
Сommit
f4927a1d59
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      app/common/model/master_worker/SalaryItemPermanently.php

+ 2 - 2
app/common/model/master_worker/SalaryItemPermanently.php

@@ -76,7 +76,6 @@ class SalaryItemPermanently extends BaseModel
             where('finished_time','between',[$params['start_time'],$params['end_time']])->
             where('service_status','=',3)->where('work_pay_status','=',2)->
             select(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->toArray();
-
             $amount = 0.00;
             foreach ($order_list as $item) {
                 $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
@@ -289,7 +288,8 @@ class SalaryItemPermanently extends BaseModel
     public function salaryCreateUpdate($itemData = [])
     {
         $wh = ['permanently_settlement_id' => $itemData['permanently_settlement_id'], 'master_worker_id' => $itemData['master_worker_id'], 'term' => $itemData['term']];
-        if(self::where($wh)->isEmpty()){
+        $info = self::where($wh)->findOrEmpty();
+        if($info->isEmpty()){
             self::create($itemData);
         }else{
             self::where($wh)->update($itemData);