|
@@ -646,7 +646,12 @@ class User Extends Model
|
|
|
$array2['why'] = '';
|
|
|
$array2['create_at'] = $v['create_at'];
|
|
|
$array2['price'] = '+'.$v['change_money'];
|
|
|
- $array2['project_name'] = '测试加班费';
|
|
|
+ if ($v['link_id']!=0){
|
|
|
+ $project_name = Order::where('id',$v['link_id'])->value('project_name');
|
|
|
+ }else{
|
|
|
+ $project_name = '';
|
|
|
+ }
|
|
|
+ $array2['project_name'] = $project_name;
|
|
|
array_push($array,$array2);
|
|
|
}
|
|
|
}else{
|