From aa3e4e81e6341f294e63c6c7b10ec5444d3e5120 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Fri, 18 Apr 2025 17:02:53 +0800
Subject: [PATCH] refactor: AboutUs

---
 app/index/controller/AboutUs.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/index/controller/AboutUs.php b/app/index/controller/AboutUs.php
index 5f3ce815..751a1412 100644
--- a/app/index/controller/AboutUs.php
+++ b/app/index/controller/AboutUs.php
@@ -42,7 +42,9 @@ class AboutUs extends Common
         $development = [];
 
         // 获取品牌里程banner
-        $banner = SysBannerModel::with(['items'])
+        $banner = SysBannerModel::with(['items' => function($query) {
+                $query->where('status', '=', 1)->order(['sort' => 'asc', 'id' => 'desc']);
+            }])
             ->uniqueLabel([
                 'BANNER_67ff786dc9c8d',
                 'BANNER_67ff7ef1354cf',
@@ -56,13 +58,9 @@ class AboutUs extends Common
             foreach ($banner as $v) {
                 $banner_map[$v->unique_label] = $v;
             }
-            $achievement = $banner_map['BANNER_67ff786dc9c8d']->items->where('status', '=', 1)->toArray();
-            $events      = $banner_map['BANNER_67ff7ef1354cf']->items->where('status', '=', 1)->toArray();
-            $development = $banner_map['BANNER_67ff7f37a0b67']->items->where('status', '=', 1)->toArray();
-            // 排序（避免关联方法使用order排序bug）
-            array_multisort(array_column($achievement, 'sort'), SORT_ASC, array_column($achievement, 'id'), SORT_DESC, $achievement);
-            array_multisort(array_column($events, 'sort'), SORT_ASC, array_column($events, 'id'), SORT_DESC, $events);
-            array_multisort(array_column($development, 'sort'), SORT_ASC, array_column($development, 'id'), SORT_DESC, $development);
+            $achievement = data_get($banner_map, 'BANNER_67ff786dc9c8d')?->items->toArray();
+            $events      = data_get($banner_map, 'BANNER_67ff7ef1354cf')?->items->toArray();
+            $development = data_get($banner_map, 'BANNER_67ff7f37a0b67')?->items->toArray();
         }
         View::assign('achievement', $achievement);
         View::assign('events', $events);