From 87507a7c1a9eb58e79566adba0f0162227e7397e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Tue, 14 Dec 2021 16:15:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/resume/show.blade.php | 19 ++++++++++---------
 resources/views/resume/tdrc.blade.php |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/resources/views/resume/show.blade.php b/resources/views/resume/show.blade.php
index c5e2570..561c4e4 100644
--- a/resources/views/resume/show.blade.php
+++ b/resources/views/resume/show.blade.php
@@ -43,6 +43,16 @@
                             {{--                                    {!! $resume->content !!}--}}
                             {{--                                </div>--}}
                             {{--                            </div>--}}
+
+                            @if($resume->part_job)
+                                <div class="tdrcCont-label">
+                                    <div class="tdrcCont-title">学术兼职</div>
+                                    <div class="tdrcCont-text">
+                                        {!! $resume->part_job !!}
+                                    </div>
+                                </div>
+                            @endif
+
                             @if($resume->project)
                                 <div class="tdrcCont-label">
                                     <div class="tdrcCont-title">主要科研项目</div>
@@ -70,15 +80,6 @@
                                 </div>
                             @endif
 
-                            @if($resume->part_job)
-                                <div class="tdrcCont-label">
-                                    <div class="tdrcCont-title">学术兼职</div>
-                                    <div class="tdrcCont-text">
-                                        {!! $resume->part_job !!}
-                                    </div>
-                                </div>
-                            @endif
-
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/resume/tdrc.blade.php b/resources/views/resume/tdrc.blade.php
index 5d6e96b..7694c47 100644
--- a/resources/views/resume/tdrc.blade.php
+++ b/resources/views/resume/tdrc.blade.php
@@ -18,7 +18,7 @@
                             </div>
                         </div>
                         @if ($articles->isNotEmpty())
-                            @foreach($articles->groupBy('group_id') as $resumes)
+                            @foreach($articles->sortBy('group_id')->groupBy('group_id') as $resumes)
                                 <div class="tdrcList">
                                     <div class="tdrcList-title">
                                         {{ $resumes->first()->group->name }}