From 39552d829cd5c5ff688e6091be26b0993cde2bb0 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Tue, 9 May 2023 11:30:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HonoraryAchievement/SchoolCategory.php           |  3 +++
 app/api/controller/Home/Home.php                     | 12 +++++-------
 .../HonoraryAchievement/SchoolCategory.php           |  1 +
 app/common/model/Home/HomeWorks.php                  |  4 ++--
 .../model/HonoraryAchievement/SchoolCategory.php     |  2 ++
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/admin/controller/HonoraryAchievement/SchoolCategory.php b/app/admin/controller/HonoraryAchievement/SchoolCategory.php
index e9f1aa5..cf0d398 100644
--- a/app/admin/controller/HonoraryAchievement/SchoolCategory.php
+++ b/app/admin/controller/HonoraryAchievement/SchoolCategory.php
@@ -32,6 +32,7 @@ class SchoolCategory extends BaseController
                 'school_category_id',
                 'school_category_guid',
                 'school_category_title',
+                'school_category_total',
                 'school_category_name',
                 'school_category_img',
                 'school_category_icon',
@@ -61,6 +62,7 @@ class SchoolCategory extends BaseController
             'school_category_update_user_guid',
             'school_category_title',
             'school_category_name',
+            'school_category_total',
             'school_category_img',
             'school_category_icon',
             'school_category_status',
@@ -87,6 +89,7 @@ class SchoolCategory extends BaseController
             'school_category_update_user_guid',
             'school_category_title',
             'school_category_icon',
+            'school_category_total',
             'school_category_name',
             'school_category_img',
             'school_category_status',
diff --git a/app/api/controller/Home/Home.php b/app/api/controller/Home/Home.php
index 68ed97f..b6297f2 100644
--- a/app/api/controller/Home/Home.php
+++ b/app/api/controller/Home/Home.php
@@ -102,8 +102,6 @@ class Home extends BaseController
     public function getHomeEnvList()
     {
         $query = ModelHomeEnv::field([
-            'home_env_id',
-            'home_env_guid',
             'home_env_img',
             'home_env_sort'
         ])
@@ -123,7 +121,7 @@ class Home extends BaseController
             'school_category_title',
             'school_category_name',
             'school_category_img',
-            'school_category_sort'
+            'school_category_total',
         ])
             ->where('school_category_status', 2)
             ->order('school_category_sort', 'asc')
@@ -146,7 +144,8 @@ class Home extends BaseController
                 'joint_achievement_sort',
             ])
             ->where('joint_achievement_status', 2)
-            ->order('joint_achievement_sort', 'asc');
+            ->order('joint_achievement_sort', 'asc')
+            ->select();
 
         return $query;
     }
@@ -208,10 +207,9 @@ class Home extends BaseController
                 'classes_name',
                 'classes_cover',
                 'classes_desc',
-                'classes_sort'
             ])
-            ->order('classes_sort', 'asc');
-
+            ->order('classes_sort', 'asc')
+            ->select();
 
         return $query;
     }
diff --git a/app/api/controller/HonoraryAchievement/SchoolCategory.php b/app/api/controller/HonoraryAchievement/SchoolCategory.php
index 1e30a26..d26a372 100644
--- a/app/api/controller/HonoraryAchievement/SchoolCategory.php
+++ b/app/api/controller/HonoraryAchievement/SchoolCategory.php
@@ -32,6 +32,7 @@ class SchoolCategory extends BaseController
                 'school_category_name',
                 'school_category_img',
                 'school_category_icon',
+                'school_category_total',
                 'school_category_sort'
             ])
             ->order('school_category_sort', 'asc')->select();
diff --git a/app/common/model/Home/HomeWorks.php b/app/common/model/Home/HomeWorks.php
index 3c58de1..375cb3f 100644
--- a/app/common/model/Home/HomeWorks.php
+++ b/app/common/model/Home/HomeWorks.php
@@ -114,11 +114,11 @@ class HomeWorks extends BaseModel
     /**
      * 作品作者类型字典获取器
      */
-    public function getHomeWorksAuthorTypeName($value,$data)
+    public function getHomeWorksAuthorTypeNameAttr($value,$data)
     {
         $home_works_author_type = $data['home_works_author_type'];
         $works_author_type = ModelDictionary::getDictionaryData('works_author_type'); 
-        $home_works_author_type =  ModelDictionary::getDataDictionaryValue($works_author_type, $home_works_author_type);
+        $home_works_author_type =  ModelDictionary::getDataDictionaryName($works_author_type, $home_works_author_type);
         return $home_works_author_type;
     }
 }
diff --git a/app/common/model/HonoraryAchievement/SchoolCategory.php b/app/common/model/HonoraryAchievement/SchoolCategory.php
index ea901ad..6b1dd2d 100644
--- a/app/common/model/HonoraryAchievement/SchoolCategory.php
+++ b/app/common/model/HonoraryAchievement/SchoolCategory.php
@@ -35,6 +35,8 @@ class SchoolCategory extends BaseModel
 
         "school_category_icon" => "string",
 
+        "school_category_total" => "int",
+
         "school_category_status" => "int",
 
         "school_category_sort" => "int",