From 8cdc73c28bd15bed92ee83fa5a8f665d68e45cc8 Mon Sep 17 00:00:00 2001
From: chengxl <chengxl@example.com>
Date: Wed, 14 May 2025 14:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wechat/controller/Article.php | 69 ++++++++++++-----------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/application/wechat/controller/Article.php b/application/wechat/controller/Article.php
index 2957804..837b199 100644
--- a/application/wechat/controller/Article.php
+++ b/application/wechat/controller/Article.php
@@ -96,44 +96,45 @@ class Article extends Controller
 
         $aWhere = ['article_id' => $iArticleId,'state' => 0,'is_report' => 1];
         $aAuthor = Db::name('article_author')->field('article_author_id,first_name,last_name,author_country,email,article_id')->where($aWhere)->select();
-        if(empty($aAuthor)){
-            return [];
-        }
+        return $aAuthor;
+        // if(empty($aAuthor)){
+        //     return [];
+        // }
 
-        //查询文章作者机构
-        $aAuthorId = array_column($aAuthor, 'article_author_id');
-        $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_author_id' => ['in',$aAuthorId]];
-        $aAuthorOrgan = Db::name('article_author_to_organ')->where($aWhere)->column('article_author_id,article_organ_id');
+        // //查询文章作者机构
+        // $aAuthorId = array_column($aAuthor, 'article_author_id');
+        // $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_author_id' => ['in',$aAuthorId]];
+        // $aAuthorOrgan = Db::name('article_author_to_organ')->where($aWhere)->column('article_author_id,article_organ_id');
 
-        //查询组织机构名称
-        if(!empty($aAuthorOrgan)){
-            $aAuthorOrganId = array_values($aAuthorOrgan);
-            $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_organ_id' => ['in',$aAuthorOrganId]];
-            $aOrgan = Db::name('article_organ')->where($aWhere)->column('article_organ_id,organ_name');
-        }
+        // //查询组织机构名称
+        // if(!empty($aAuthorOrgan)){
+        //     $aAuthorOrganId = array_values($aAuthorOrgan);
+        //     $aWhere = ['article_id' => $iArticleId,'state' => 0,'article_organ_id' => ['in',$aAuthorOrganId]];
+        //     $aOrgan = Db::name('article_organ')->where($aWhere)->column('article_organ_id,organ_name');
+        // }
 
-        //数据整合
-        $aAuthorInfo = [];
-        foreach($aAuthor as $key => $value){
-            //作者姓名
-            $sAuthorName = $value['last_name'].$value['first_name'];
+        // //数据整合
+        // $aAuthorInfo = [];
+        // foreach($aAuthor as $key => $value){
+        //     //作者姓名
+        //     $sAuthorName = $value['last_name'].$value['first_name'];
             
-            //所属机构ID
-            $iOrganId = empty($aAuthorOrgan[$value['article_author_id']]) ? 0 : $aAuthorOrgan[$value['article_author_id']];
-            if(empty($iOrganId)){
-                $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']];
-                continue;
-            }
-            //获取所属机构名称
-            $sOrganName = empty($aOrgan[$iOrganId]) ? '' : $aOrgan[$iOrganId];
-            if(empty($sOrganName)){
-                $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']];
-                continue;
-            }
-            $sOrganName = empty($sOrganName) ? '' : $sOrganName;
-            $aAuthorInfo[] = ['company' => $sOrganName,'author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']];
-        }
-        return $aAuthorInfo;
+        //     //所属机构ID
+        //     $iOrganId = empty($aAuthorOrgan[$value['article_author_id']]) ? 0 : $aAuthorOrgan[$value['article_author_id']];
+        //     if(empty($iOrganId)){
+        //         $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']];
+        //         continue;
+        //     }
+        //     //获取所属机构名称
+        //     $sOrganName = empty($aOrgan[$iOrganId]) ? '' : $aOrgan[$iOrganId];
+        //     if(empty($sOrganName)){
+        //         $aAuthorInfo[] = ['author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']];
+        //         continue;
+        //     }
+        //     $sOrganName = empty($sOrganName) ? '' : $sOrganName;
+        //     $aAuthorInfo[] = ['company' => $sOrganName,'author_name' => $sAuthorName,'email' => $value['email'],'article_id' => $value['article_id']];
+        // }
+        // return $aAuthorInfo;
     }
 
 }