From 89c8de2120044c10af71f2c625d35a84ed98f55b Mon Sep 17 00:00:00 2001 From: chengxl Date: Tue, 3 Jun 2025 13:38:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E7=A8=BF=E4=BA=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Reviewer.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php index 260f45c..5000229 100644 --- a/application/api/controller/Reviewer.php +++ b/application/api/controller/Reviewer.php @@ -1874,7 +1874,7 @@ class Reviewer extends Base //查询基本条件 - $aWhere = ['journal_id' => ['in',$jous],'state' => 0]; + $aWhere = ['t_reviewer_to_journal.journal_id' => ['in',$jous],'t_reviewer_to_journal.state' => 0]; if(!empty($data['grade'])){ $aWhere['grade'] = trim($data['grade']); } @@ -1909,7 +1909,9 @@ class Reviewer extends Base } //获取数据详情 $aResult = $this->reviewer_to_journal_obj - ->field('t_reviewer_to_journal.is_yboard,t_reviewer_to_journal.grade,t_reviewer_to_journal.journal_id,t_reviewer_to_journal.reviewer_id') + ->field('t_reviewer_to_journal.is_yboard,t_reviewer_to_journal.grade,t_reviewer_to_journal.journal_id,t_reviewer_to_journal.reviewer_id,t_user.user_id,t_user.account,t_user.email,t_user.phone,t_user.nickname,t_user.realname,t_user.localname,t_user.type,t_user.score,t_user.remark,t_user.wos_index,t_user.wos_time,t_user.g_author,t_user.g_website,t_user.google_index,t_user.google_time,t_user.google_editor,t_user.scopus_index,t_user.scopus_time,t_user.scopus_website,t_user.scopus_editor,t_user.code,t_user.orcid,t_user.orcid_code,t_user.review_num_two_year') + ->join('t_user', 't_user.user_id = t_reviewer_to_journal.reviewer_id', 'left') + ->order('t_user.review_num_two_year desc') ->where($aWhere) ->limit($iOffset, $iSize) ->select(); @@ -1923,9 +1925,9 @@ class Reviewer extends Base $aReviewer = Db::name('user_reviewer_info')->field('reviewer_id,gender,technical,country,introduction,company,website,field,qualifications')->where(['reviewer_id'=>['in',$aReviewerId]])->select(); $aReviewer = empty($aReviewer) ? [] : array_column($aReviewer, null,'reviewer_id'); - //用户基本信息 - $aUser = Db::name('user')->field('user_id,account,email,phone,nickname,realname,localname,type,score,remark,wos_index,wos_time,g_author,g_website,google_index,google_time,google_editor,scopus_index,scopus_time,scopus_website,scopus_editor,code,orcid,orcid_code')->where(['user_id'=>['in',$aReviewerId]])->select(); - $aUser = empty($aUser) ? [] : array_column($aUser, null,'user_id'); + // //用户基本信息 + // $aUser = Db::name('user')->field('user_id,account,email,phone,nickname,realname,localname,type,score,remark,wos_index,wos_time,g_author,g_website,google_index,google_time,google_editor,scopus_index,scopus_time,scopus_website,scopus_editor,code,orcid,orcid_code,review_num_two_year')->where(['user_id'=>['in',$aReviewerId]])->select(); + // $aUser = empty($aUser) ? [] : array_column($aUser, null,'user_id'); //查询CV $aUserCv = $this->user_cv_obj->where(['user_id'=>['in',$aReviewerId],'state' =>0])->select(); @@ -1954,11 +1956,11 @@ class Reviewer extends Base $aResult[$key] += $aReviewerInfo; } - //审稿人信息 - $aUserInfo = empty($aUser[$value['reviewer_id']]) ? [] : $aUser[$value['reviewer_id']]; - if(!empty($aUserInfo)){ - $aResult[$key] += $aUserInfo; - } + // //审稿人信息 + // $aUserInfo = empty($aUser[$value['reviewer_id']]) ? [] : $aUser[$value['reviewer_id']]; + // if(!empty($aUserInfo)){ + // $aResult[$key] += $aUserInfo; + // } //用户CVS信息 $aUserCvInfo = empty($aUserCvArray[$value['reviewer_id']]) ? [] : $aUserCvArray[$value['reviewer_id']]; $aResult[$key]['cvs'] = empty($aUserCvInfo) ? [] : $aUserCvInfo;