正在显示
1 个修改的文件
包含
1 行增加
和
1 行删除
@@ -129,7 +129,7 @@ class User extends Api | @@ -129,7 +129,7 @@ class User extends Api | ||
129 | 'work_salary_month' => $user['work_salary_month'], | 129 | 'work_salary_month' => $user['work_salary_month'], |
130 | 'work_subsidy' => ($user['is_work'] == '1' && $user['factory']) ? $user['factory']['work_subsidy'] : 0, | 130 | 'work_subsidy' => ($user['is_work'] == '1' && $user['factory']) ? $user['factory']['work_subsidy'] : 0, |
131 | 'work_subsidy_month' => $user['work_subsidy_month'], | 131 | 'work_subsidy_month' => $user['work_subsidy_month'], |
132 | - 'lower_work_hours_month' => $lower_work_hours_month, | 132 | + 'lower_work_hours_month' => $lower_work_hours_month ? $lower_work_hours_month : '0.0', |
133 | 'recruit_subsidy_month' => $user['recruit_subsidy_month'], | 133 | 'recruit_subsidy_month' => $user['recruit_subsidy_month'], |
134 | // 'salary' => $salary, //总工资 | 134 | // 'salary' => $salary, //总工资 |
135 | 'salary' => $user['work_subsidy_month']+$user['recruit_subsidy_month'], | 135 | 'salary' => $user['work_subsidy_month']+$user['recruit_subsidy_month'], |
-
请 注册 或 登录 后发表评论