This commit is contained in:
chengxl
2025-08-28 15:45:26 +08:00
parent df3a5f0b15
commit a35d7c4a81

View File

@@ -582,7 +582,7 @@ class Finalreview extends Base
//查询终审记录 //查询终审记录
if(in_array('final', $sQuery)){ if(in_array('final', $sQuery)){
$aWhere = ['article_id' => $iArticleId,'state' => ['between',[1,3]]]; $aWhere = ['article_id' => $iArticleId,'state' => ['between',[1,3]]];
$aFinal = Db::name('article_reviewer_final')->field('reviewer_id,state,suggest_for_editor,suggest_for_author,review_time')->where($aWhere)->select(); $aFinal = Db::name('article_reviewer_final')->field('id,reviewer_id,state,suggest_for_editor,suggest_for_author,review_time')->where($aWhere)->select();
if(!empty($aFinal)){ if(!empty($aFinal)){
//查询用户信息 //查询用户信息
$aUserId = array_column($aFinal, 'reviewer_id'); $aUserId = array_column($aFinal, 'reviewer_id');
@@ -872,7 +872,7 @@ class Finalreview extends Base
$sOrder = empty($aParam['order']) ? 'type desc,user_id desc' : $aParam['order'];//排序 $sOrder = empty($aParam['order']) ? 'type desc,user_id desc' : $aParam['order'];//排序
$aLists = Db::table("({$sQuery}) sQuery") $aLists = Db::table("({$sQuery}) sQuery")
->join('t_user', 'sQuery.reviewer_id = t_user.user_id') ->join('t_user', 'sQuery.reviewer_id = t_user.user_id')
->field('sQuery.reviewer_id,sQuery.reviewer_type,sQuery.state,sQuery.suggest_for_author,sQuery.suggest_for_editor,sQuery.update_time,t_user.account,t_user.email,t_user.realname,t_user.localname') ->field('sQuery.id,sQuery.reviewer_id,sQuery.reviewer_type,sQuery.state,sQuery.suggest_for_author,sQuery.suggest_for_editor,sQuery.update_time,t_user.account,t_user.email,t_user.realname,t_user.localname')
->where($aWhere) ->where($aWhere)
->order($sOrder) ->order($sOrder)
->page($iPage, $iSize) ->page($iPage, $iSize)