From 2191a7d284e6b12980b1e7f25b113d5c1c8516ab Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Sat, 13 May 2023 17:15:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AboutUs/TeachingEnvir/TeachingEnvir.php   |  6 +--
 app/admin/controller/Home/HomeWorks.php       | 44 +++++++++++++++++++
 app/api/controller/ContactUs/Signup.php       |  2 +-
 .../HonoraryAchievement/SchoolLeaders.php     |  3 ++
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/AboutUs/TeachingEnvir/TeachingEnvir.php b/app/admin/controller/AboutUs/TeachingEnvir/TeachingEnvir.php
index 5f94c20..4bd4a9a 100644
--- a/app/admin/controller/AboutUs/TeachingEnvir/TeachingEnvir.php
+++ b/app/admin/controller/AboutUs/TeachingEnvir/TeachingEnvir.php
@@ -64,7 +64,7 @@ class TeachingEnvir extends BaseController
     public function addTeachingEnvir(Request $request): array
     {
         Db::startTrans();
-        Tool::adminLockTableWrite('teaching_envire');
+        Tool::adminLockTableWrite('teaching_envir');
         try {
             $params = $request->param();
             $this->validate($params, [
@@ -106,7 +106,7 @@ class TeachingEnvir extends BaseController
     public function editTeachingEnvir(Request $request): array
     {
         Db::startTrans();
-        Tool::adminLockTableWrite('teaching_envire');
+        Tool::adminLockTableWrite('teaching_envir');
         try {
             $params = $request->param();
             $this->validate($params, [
@@ -148,7 +148,7 @@ class TeachingEnvir extends BaseController
     public function deleteTeachingEnvir(Request $request): array
     {
         Db::startTrans();
-        Tool::adminLockTableWrite('teaching_envire');
+        Tool::adminLockTableWrite('teaching_envir');
         try {
             $params = $request->param();
             $this->validate($params, [
diff --git a/app/admin/controller/Home/HomeWorks.php b/app/admin/controller/Home/HomeWorks.php
index 9f98999..ff419fc 100644
--- a/app/admin/controller/Home/HomeWorks.php
+++ b/app/admin/controller/Home/HomeWorks.php
@@ -73,6 +73,50 @@ class HomeWorks extends BaseController
         }
     }
 
+    /**
+     * 批量添加首页作品
+     */
+    public function batchAddHomeWorks(Request $request): array
+    {
+        Db::startTrans();
+        Tool::adminLockTableWrite('home_works');
+        try {
+            $params = $request->param();
+            $this->validate($params, [
+                'home_works_img|图片' => 'require',
+            ]);
+
+            $arr = explode(",", $params['home_works_img']);
+            // return $arr;
+            if (empty($arr)) {
+                $model = ModelHomeWorks::create($params, [
+                    'home_works_guid',
+                    'home_works_create_user_guid',
+                    'home_works_update_user_guid',
+                    'home_works_author_type',
+                    'home_works_img',
+                    'home_works_sort',
+                    'home_works_intro'
+                ]);
+            } else {
+                foreach ($arr as $key => $value) {
+                    ModelHomeWorks::create([
+                        'home_works_author_type' => $params['home_works_author_type'],
+                        'home_works_intro' => $params['home_works_intro'],
+                        'home_works_img' => $value,
+                    ]);
+                }
+            }
+            Db::commit();
+            Tool::unlockTable();
+            return msg('批量添加成功!');
+        } catch (\Throwable $th) {
+            Db::rollback();
+            Tool::unlockTable();
+            throw  $th;
+        }
+    }
+
     /**
      * 编辑首页作品
      */
diff --git a/app/api/controller/ContactUs/Signup.php b/app/api/controller/ContactUs/Signup.php
index e324b5a..2163670 100644
--- a/app/api/controller/ContactUs/Signup.php
+++ b/app/api/controller/ContactUs/Signup.php
@@ -47,7 +47,6 @@ class Signup extends BaseController
         $params = $request->param();
         $this->validate($params, [
             'signup_user_name|报名用户名称' => 'require',
-            'captcha|验证码' => 'require|captcha',
             'signup_user_phone|报名用户电话' => 'require',
             'signup_user_parents_phone|报名用户家长电话' => 'require',
             'signup_user_home_address|报名用户家庭地址' => 'require',
@@ -55,6 +54,7 @@ class Signup extends BaseController
             'signup_user_arrival_time|报名用户预计到校时间' => 'require',
             'classes_guid|报名用户选择班型' => 'require',
             'signup_user_grad_type|报名用户毕业类型' => 'require',
+            'captcha|验证码' => 'require|captcha',
         ]);
 
         ModelSignup::create($params, [
diff --git a/app/common/model/HonoraryAchievement/SchoolLeaders.php b/app/common/model/HonoraryAchievement/SchoolLeaders.php
index a921441..7de7a66 100644
--- a/app/common/model/HonoraryAchievement/SchoolLeaders.php
+++ b/app/common/model/HonoraryAchievement/SchoolLeaders.php
@@ -25,6 +25,8 @@ class SchoolLeaders extends BaseModel
 
         "school_leaders_id" => "int",
 
+        "school_leaders_guid" => "string",
+
         "school_leaders_name" => "string",
 
         "school_category_guid" => "string",
@@ -97,6 +99,7 @@ class SchoolLeaders extends BaseModel
         $model->completeUpdateField();
     }
 
+
     /**
      * 删除前
      */