Просмотр исходного кода

Merge branch 'feature/2175-team-perf' into dev

theo 3 лет назад
Родитель
Сommit
a9a90eb000
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      frontendApi/modules/v1/controllers/BonusController.php

+ 2 - 2
frontendApi/modules/v1/controllers/BonusController.php

@@ -139,8 +139,8 @@ class BonusController extends BaseController {
         if (!empty($data)) {
             $userCheck = PerfMonth::checkStatus($data['PV_PCS']+$data['PV_PSS']);
             $user[0]['user_perf'] = $data['PV_PCS'];
-            $user[0]['team_perf'] = $userCheck ? '' : $data['PV_PSS'];
-            $user[0]['total_perf'] = $userCheck ? '' : $data['PV_PCS']+$data['PV_PSS'];
+            $user[0]['team_perf'] = $data['PV_PSS'];
+            $user[0]['total_perf'] = $data['PV_PCS']+$data['PV_PSS'];
             $user[0]['perf_status'] = $userCheck ? '1' : $user[0]['perf_status'];
             $user[0]['perf_status_name'] = $userCheck ? '达标' : $user[0]['perf_status_name'];
         }