From eb3d2455097142606cbf5d785fdbea3065b3bba2 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Tue, 9 May 2023 11:56:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/TeachersStrength/Teacher.php |  3 +++
 app/api/controller/TeachersStrength/Teachers.php  | 13 ++++++-------
 app/common/model/TeachersStrength/Teacher.php     |  2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/admin/controller/TeachersStrength/Teacher.php b/app/admin/controller/TeachersStrength/Teacher.php
index 817a250..0b99bb2 100644
--- a/app/admin/controller/TeachersStrength/Teacher.php
+++ b/app/admin/controller/TeachersStrength/Teacher.php
@@ -37,6 +37,7 @@ class Teacher extends BaseController
                 'a.subject_guid',
                 'b.subject_name',
                 'a.teacher_intro',
+                'a.teacher_content',
                 'a.teacher_status',
                 'a.teacher_order'
             ])
@@ -70,6 +71,7 @@ class Teacher extends BaseController
                 'teacher_name',
                 'teacher_position',
                 'teacher_img',
+                'teacher_content',
                 'subject_guid',
                 'teacher_intro',
                 'teacher_status',
@@ -105,6 +107,7 @@ class Teacher extends BaseController
                 'teacher_update_user_guid',
                 'teacher_name',
                 'teacher_position',
+                'teacher_content',
                 'teacher_img',
                 'subject_guid',
                 'teacher_intro',
diff --git a/app/api/controller/TeachersStrength/Teachers.php b/app/api/controller/TeachersStrength/Teachers.php
index 033330d..280a4b9 100644
--- a/app/api/controller/TeachersStrength/Teachers.php
+++ b/app/api/controller/TeachersStrength/Teachers.php
@@ -42,10 +42,10 @@ class Teachers extends BaseController
         }
 
         $con = Tool::getOptionalQuery(
-            ['params'=> $params],
+            ['params' => $params],
             ['teacher_name', 'LIKE'],
-             ['b.subject_id', '='],
-            );
+            ['b.subject_id', '='],
+        );
 
         $query = ModelTeachers::where($con)
             ->field([
@@ -55,12 +55,11 @@ class Teachers extends BaseController
                 'a.teacher_img',
                 'a.subject_guid',
                 'b.subject_name',
-                'a.teacher_order'
             ])
             ->alias('a')
             ->leftjoin('subject b', 'a.subject_guid = b.subject_guid')
             ->append(['teacher_eng_name'])
-            ->hidden(['subject_guid', 'teacher_order'])
+            ->hidden(['subject_guid'])
             ->order('teacher_order', 'asc')
             ->select();
 
@@ -86,13 +85,13 @@ class Teachers extends BaseController
             'a.teacher_img',
             'a.subject_guid',
             'b.subject_name',
+            'a.teacher_content',
             'a.teacher_intro',
-            'a.teacher_order'
         ])
             ->alias('a')
             ->leftjoin('subject b', 'a.subject_guid = b.subject_guid')
             ->append(['teacher_eng_name'])
-            ->hidden(['subject_guid', 'teacher_order'])
+            ->hidden(['subject_guid'])
             ->where('teacher_id', $params['teacher_id'])
             ->find();
 
diff --git a/app/common/model/TeachersStrength/Teacher.php b/app/common/model/TeachersStrength/Teacher.php
index d52efce..a5eb23f 100644
--- a/app/common/model/TeachersStrength/Teacher.php
+++ b/app/common/model/TeachersStrength/Teacher.php
@@ -34,6 +34,8 @@ class Teacher extends BaseModel
 
         "teacher_img" => "string",
 
+        "teacher_content" => "string",
+
         "subject_guid" => "string",
 
         "teacher_intro" => "string",