From 9c32ae51dbc13ce47389e1d6fd22d7c0d3ef9d44 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Thu, 18 Sep 2025 09:50:50 +0800
Subject: [PATCH] kpi

---
 .../targets/controller/SalesAnnualTargetsController.php     | 6 +++++-
 app/admin/targets/service/SalesMonthlyTargetsService.php    | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/admin/targets/controller/SalesAnnualTargetsController.php b/app/admin/targets/controller/SalesAnnualTargetsController.php
index 15d6652..6a51d08 100644
--- a/app/admin/targets/controller/SalesAnnualTargetsController.php
+++ b/app/admin/targets/controller/SalesAnnualTargetsController.php
@@ -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;
      }
 }
\ No newline at end of file
diff --git a/app/admin/targets/service/SalesMonthlyTargetsService.php b/app/admin/targets/service/SalesMonthlyTargetsService.php
index 12bb203..a093fc5 100644
--- a/app/admin/targets/service/SalesMonthlyTargetsService.php
+++ b/app/admin/targets/service/SalesMonthlyTargetsService.php
@@ -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':