Merge branch 'feature/kpi' into develop

2025-09-18 09:51:01 +08:00
parent c25405832a 9c32ae51db
commit 8fea768e3c
2 changed files with 8 additions and 1 deletions
@@ -32,10 +32,14 @@ class SalesAnnualTargetsController extends BaseController
             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
         if (isset($data['corp_id'])){
             $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name');
-             $data['corp_name'] = $data['corp_name']??'合塑集团';
+//             $data['corp_name'] = $data['corp_name']??'合塑集团';
         }
         if (isset($data['user_id']))
             $data['user_name'] = User::where('id', $data['user_id'])->value('name');
+
+         if (empty($data['corp_id']) || empty($data['user_id'])){
+             $data['user_name'] = '合塑集团';
+         }
         return $data;
     }
 }
@@ -45,6 +45,9 @@ class SalesMonthlyTargetsService
                if (isset($p['year']) && $p['year']) {
                    $config['where']['year'] = $p['year'];
                }
+                $config['order']['year'] = 'desc';
+                $config['order']['user_id'] = 'desc';
+                $config['order']['month'] = 'asc';
                $config['order']['id'] = 'desc';
                break;
            case 'show':