审稿人推荐调整

application/api/controller/Reviewer.php

@@ -2242,7 +2242,7 @@ class Reviewer extends Base
         $aReviewerCompany = [];
         if(!empty($aUserId)){
             //作者同机构的审稿人
-            $aReviewerCompany = Db::name('user_reviewer_info')->where(['reviewer_id' => ['in',$aUserId],'state' => 0])->column('reviewer_id,company');
+            $aReviewerCompany = Db::name('user_reviewer_info')->where(['reviewer_id' => ['in',$aUserId],'state' => 0,'company' => ['<>','']])->column('reviewer_id,company');
         }
 
         //文章作者机构信息
@@ -2277,7 +2277,12 @@ class Reviewer extends Base
 
         //过滤审稿人机构
         if(!empty($aAuthorCompany)){
-            $where['t_user_reviewer_info.company'] = ['not in', $aAuthorCompany];
+            $aAuthorCompany = array_filter($aAuthorCompany, function($v) {
+                return trim((string)$v) !== '';
+            });
+            if(!empty($aAuthorCompany)){
+                $where['t_user_reviewer_info.company'] = ['not in', $aAuthorCompany];
+            }
         }
         // 计算10天之后的时间戳（10天 = 10 * 24 * 60 * 60秒）
         $iTeenDaysLater = strtotime('-10 days');
@@ -2292,6 +2297,7 @@ class Reviewer extends Base
                 ->whereOr('t_user_reviewer_info.last_invite_time', '=', 0);
             })
         ->count();
+
         if(empty($count)){
             return jsonSuccess(['reviewers' => [],'count' => 0]);
         }