From 54ff79075035087a8686ab90b4408c979d7d842f Mon Sep 17 00:00:00 2001
From: chengxl <chengxl@example.com>
Date: Wed, 22 Oct 2025 15:15:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E7=BC=96=E5=A7=94=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Web.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/Web.php b/application/api/controller/Web.php
index 6d81cf0..0fbe7f7 100644
--- a/application/api/controller/Web.php
+++ b/application/api/controller/Web.php
@@ -407,7 +407,7 @@ class Web extends Base
     {
         $ca_board = [];
         $boards = $this->board_to_journal_obj
-            ->field("t_board_to_journal.*,t_board_group.group_name,t_user.account,t_user.email,t_user.realname,t_user.icon,t_user.google_index,t_user.google_time,t_user.wos_index,t_user.wos_time,t_user_reviewer_info.*")
+            ->field("t_board_to_journal.btj_id,t_board_to_journal.user_id,t_board_to_journal.board_group_id,t_board_to_journal.journal_id,t_board_to_journal.type,t_board_to_journal.research_areas,t_board_to_journal.realname as board_realname,t_board_to_journal.email as board_email,t_board_to_journal.website as board_website,t_board_to_journal.affiliation as board_affiliation,t_board_to_journal.icon as board_icon,t_board_to_journal.technical as board_technical,t_board_to_journal.remark,t_board_to_journal.state,t_board_group.group_name,t_user.account,t_user.email,t_user.realname,t_user.icon,t_user.google_index,t_user.google_time,t_user.wos_index,t_user.wos_time,t_user_reviewer_info.*")
             ->join("t_board_group", "t_board_group.board_group_id = t_board_to_journal.board_group_id", "left")
             ->join("t_user", "t_user.user_id = t_board_to_journal.user_id", "left")
             ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id=t_board_to_journal.user_id", "left")
@@ -415,7 +415,6 @@ class Web extends Base
             ->where('t_board_to_journal.state', 0)
             ->order("t_board_group.board_group_id asc,t_user.realname")
             ->select();
-
         foreach ($boards as $val) {
             if ($aar) {
                 $article1 = $this->article_obj->where('user_id', $val['user_id'])->where('journal_id', $val['journal_id'])->where('state', 5)->where('ctime', ">", strtotime("-1 year"))->select();
@@ -431,6 +430,15 @@ class Web extends Base
                 $val['reviewes'] = $reviewes;
             }
 
+            //编委数据隔离加默认数据 chengxiaoling 20251022 start
+            $val['realname'] = empty($val['board_realname']) ? $val['realname'] : $val['board_realname'];
+            $val['email'] = empty($val['board_email']) ? $val['email'] : $val['board_email'];
+            $val['technical'] = empty($val['board_technical']) ? $val['technical'] : $val['board_technical'];
+            $val['website'] = empty($val['board_website']) ? $val['website'] : $val['board_website'];
+            $val['icon'] = empty($val['board_icon']) ? $val['icon'] : $val['board_icon'];
+            $val['company'] = empty($val['board_affiliation']) ? $val['company'] : $val['board_affiliation'];
+            //编委数据隔离加默认数据 chengxiaoling 20251022 end
+
             if ($val['type'] == 0) {//主编
                 $ca_board['main'][] = $val;
             } elseif ($val['type'] == 1) {//副主编