From ce2329a71c6f36679f0650afc8556f6780cde15b Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Thu, 15 Jun 2023 10:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E6=9F=A5=E6=89=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Controllers/StudentController.php | 8 ++++++--
 app/Http/Admin/Services/Student.php              | 3 ++-
 app/Http/Admin/Views/student/list.volt           | 9 +++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/Http/Admin/Controllers/StudentController.php b/app/Http/Admin/Controllers/StudentController.php
index b846002f..324c6943 100644
--- a/app/Http/Admin/Controllers/StudentController.php
+++ b/app/Http/Admin/Controllers/StudentController.php
@@ -20,11 +20,13 @@ class StudentController extends Controller
      */
     public function searchAction()
     {
+        $courseId = $this->request->getQuery('course_id', 'int', 0);
+
         $studentService = new StudentService();
 
         $sourceTypes = $studentService->getSourceTypes();
 
-        $xmCourses = $studentService->getXmCourses('all');
+        $xmCourses = $studentService->getXmCourses('all', $courseId);
 
         $this->view->setVar('source_types', $sourceTypes);
         $this->view->setVar('xm_courses', $xmCourses);
@@ -56,9 +58,11 @@ class StudentController extends Controller
      */
     public function addAction()
     {
+        $courseId = $this->request->getQuery('course_id', 'int', 0);
+
         $studentService = new StudentService();
 
-        $xmCourses = $studentService->getXmCourses('charge');
+        $xmCourses = $studentService->getXmCourses('all', $courseId);
 
         $this->view->setVar('xm_courses', $xmCourses);
     }
diff --git a/app/Http/Admin/Services/Student.php b/app/Http/Admin/Services/Student.php
index d583d320..1743e513 100644
--- a/app/Http/Admin/Services/Student.php
+++ b/app/Http/Admin/Services/Student.php
@@ -20,7 +20,7 @@ use App\Validators\CourseUser as CourseUserValidator;
 class Student extends Service
 {
 
-    public function getXmCourses($scope = 'all')
+    public function getXmCourses($scope = 'all', $courseId = 0)
     {
         $courseRepo = new CourseRepo();
 
@@ -46,6 +46,7 @@ class Student extends Service
             $result[] = [
                 'name' => sprintf('%s - %s（¥%0.2f）', $item->id, $item->title, $item->market_price),
                 'value' => $item->id,
+                'selected' => $item->id == $courseId,
             ];
         }
 
diff --git a/app/Http/Admin/Views/student/list.volt b/app/Http/Admin/Views/student/list.volt
index 2be6a8c1..7f3dfd71 100644
--- a/app/Http/Admin/Views/student/list.volt
+++ b/app/Http/Admin/Views/student/list.volt
@@ -18,8 +18,13 @@
         {% endif %}
     {%- endmacro %}
 
-    {% set add_url = url({'for':'admin.student.add'}) %}
-    {% set search_url = url({'for':'admin.student.search'}) %}
+    {% if course %}
+        {% set add_url = url({'for':'admin.student.add'},{'course_id':course.id}) %}
+        {% set search_url = url({'for':'admin.student.search'},{'course_id':course.id}) %}
+    {% else %}
+        {% set add_url = url({'for':'admin.student.add'}) %}
+        {% set search_url = url({'for':'admin.student.search'}) %}
+    {% endif %}
 
     <div class="kg-nav">
         <div class="kg-nav-left">