From a2bd1d16ee99ed4e1c5f04b6897e1e5f60006714 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Thu, 4 May 2023 21:30:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=BAssr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/ContactUs/Signup.php       |  2 +-
 .../ExaminationInformation/InfoArticle.php    | 27 ++++++++++++++++---
 .../controller/TeachersStrength/Teachers.php  | 22 ++++++++++++++-
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/app/api/controller/ContactUs/Signup.php b/app/api/controller/ContactUs/Signup.php
index 56a1036..49cbc78 100644
--- a/app/api/controller/ContactUs/Signup.php
+++ b/app/api/controller/ContactUs/Signup.php
@@ -47,7 +47,7 @@ class Signup extends BaseController
         $params = $request->param();
         $this->validate($params, [
             'signup_user_name|报名用户名称' => 'require',
-            // 'captcha|验证码' => 'require|captcha',
+            'captcha|验证码' => 'require|captcha',
             'signup_user_phone|报名用户电话' => 'require',
             'signup_user_parents_phone|报名用户家长电话' => 'require',
             'signup_user_home_address|报名用户家庭地址' => 'require',
diff --git a/app/api/controller/ExaminationInformation/InfoArticle.php b/app/api/controller/ExaminationInformation/InfoArticle.php
index 78558c1..f49c271 100644
--- a/app/api/controller/ExaminationInformation/InfoArticle.php
+++ b/app/api/controller/ExaminationInformation/InfoArticle.php
@@ -4,6 +4,7 @@ namespace app\api\controller\ExaminationInformation;
 
 use app\BaseController;
 use app\common\model\ExaminationInformation\InfoArticle as ModelinfoArticle;
+use app\common\model\ExaminationInformation\InfoArticleType as ModelinfoArticleType;
 use app\Request;
 use think\Validate;
 use think\exception\ValidateException;
@@ -20,17 +21,35 @@ class InfoArticle extends BaseController
     /**
      * 获取资讯文章列表
      */
-    public function getinfoArticleList(Request $request): array
+    public function getinfoArticleList(Request $request)
     {
         $params = $request->param();
         $con = [];
 
         $this->validate($params, [
-            'info_article_type_id|文章类型id' => 'require',
+            'idx|文章类型id' => 'require',
         ]);
-        $con = Tool::getOptionalQuery(['b.info_article_type_id', '='],);
 
-        $query = ModelinfoArticle::where($con)
+        $type = ModelinfoArticleType::
+            field([
+                'info_article_type_id',
+                'info_article_type_name' => 'name',
+            ])
+            ->order('info_article_type_sort', 'asc')
+            ->select();
+
+        $idx = $params['idx'];
+        $params['info_article_type_id'] = null;
+        foreach ($type as $key => $value) {
+            if($key == $params['idx']){
+                $params['info_article_type_id'] = $value['info_article_type_id'];
+            }
+        }
+
+        if(!$params['info_article_type_id']) throwErrorMsg("传值不正确！");
+
+
+        $query = ModelinfoArticle::where('b.info_article_type_id',$params['info_article_type_id'])
             ->field([
                 'a.info_article_id',
                 'a.info_article_type_guid',
diff --git a/app/api/controller/TeachersStrength/Teachers.php b/app/api/controller/TeachersStrength/Teachers.php
index 91d48b2..033330d 100644
--- a/app/api/controller/TeachersStrength/Teachers.php
+++ b/app/api/controller/TeachersStrength/Teachers.php
@@ -4,6 +4,7 @@ namespace app\api\controller\TeachersStrength;
 
 use app\BaseController;
 use app\common\model\TeachersStrength\Teacher as ModelTeachers;
+use app\common\model\TeachersStrength\Subject as ModelSubject;
 use app\Request;
 use think\Validate;
 use think\exception\ValidateException;
@@ -25,7 +26,26 @@ class Teachers extends BaseController
         $params = $request->param();
         $con = [];
 
-        $con = Tool::getOptionalQuery(['teacher_name', 'LIKE'], ['b.subject_id', '='],);
+        $subject = ModelSubject::where($con)
+            ->field([
+                'subject_id',
+                'subject_name' => 'name',
+            ])
+            ->order('subject_sort', 'asc')
+            ->select();
+
+        $params['subject_id'] = null;
+        foreach ($subject as $key => $value) {
+            if ($key == $params['idx']) {
+                $params['subject_id'] = $value['subject_id'];
+            }
+        }
+
+        $con = Tool::getOptionalQuery(
+            ['params'=> $params],
+            ['teacher_name', 'LIKE'],
+             ['b.subject_id', '='],
+            );
 
         $query = ModelTeachers::where($con)
             ->field([