From dc47f2d0a46432b720369c7736569c2dc7080abf Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Thu, 29 May 2025 14:04:01 +0800
Subject: [PATCH] =?UTF-8?q?major=20=E5=B0=8F=E7=89=88=E6=9C=AC=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Reviewer.php | 19 ++++++++++++++++---
 application/api/controller/Ucenter.php  |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php
index d19c140..08358a8 100644
--- a/application/api/controller/Reviewer.php
+++ b/application/api/controller/Reviewer.php
@@ -313,9 +313,20 @@ class Reviewer extends Base
             ->where('t_user.email', $data['email'])
             ->where('t_user.state', 0)
             ->find();
-        $check['majorshu'] = getMajorShu($check['major']);
+//        $check['majorshu'] = getMajorShu($check['major']);
         $check['cvs'] = getReviewerCvs($check['user_id']);
         $check['title'] = $check['technical'];
+
+
+        $majors = $this->major_to_user_obj->where("user_id",$user_info['user_id'])->where("state",0)->select();
+        foreach ($majors as $k => $v){
+            $majors[$k]['shu'] = $this->getMajorShu($v['major_id']);
+            $majors[$k]['str'] = $this->getMajorStr($v['major_id']);
+        }
+        $check['major'] = $majors;
+
+
+
         $re['result'] = $check;
         return jsonSuccess($re);
 
@@ -1611,7 +1622,8 @@ class Reviewer extends Base
         $info_insert['country'] = $data['country'];
         $info_insert['introduction'] = isset($data['introduction']) ? trim($data['introduction']) : '';
         $info_insert['company'] = isset($data['company']) ? trim($data['company']) : '';
-        $info_insert['major'] = $data['major'];
+        self::updateUserMajor($uid,$data['major']);
+//        $info_insert['major'] = $data['major'];
         $cv = isset($data['cv'])?trim($data['cv']):'';
 //        $info_insert['qualifications'] = $cv;
         //处理cv表
@@ -1686,12 +1698,13 @@ class Reviewer extends Base
         $info_insert['country'] = $data['country'];
         $info_insert['introduction'] = isset($data['introduction']) ? trim($data['introduction']) : '';
         $info_insert['company'] = isset($data['company']) ? trim($data['company']) : '';
-        $info_insert['major'] = $data['major'];
+//        $info_insert['major'] = $data['major'];
         // $info_insert['cmajor'] = $data['cmajor'];
         $info_insert['field'] = trim($data['field']);
 //        $info_insert['qualifications'] = trim($data['cv']);
         $cv = isset($data['cv'])?trim($data['cv']):'';
 //        $info_insert['qualifications'] = $cv;
+        self::updateUserMajor($data['user_id'],$data['major']);
         //处理cv表
         $c_cv = $this->user_cv_obj->where("user_id",$data['user_id'])->where("cv",$cv)->where("state",0)->find();
         if(!$c_cv&&$cv!=''){
diff --git a/application/api/controller/Ucenter.php b/application/api/controller/Ucenter.php
index 203f4c9..17c3824 100644
--- a/application/api/controller/Ucenter.php
+++ b/application/api/controller/Ucenter.php
@@ -383,7 +383,7 @@ class Ucenter extends Base{
 
 
     public function up_test(){
-        $res = self::updateUserMajor(20837,"16,14");
+        $res = self::updateUserMajor(20838,"16,14");
         return jsonSuccess($res);
     }