Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

application/api/controller/Article.php

@@ -161,10 +161,16 @@ class Article extends Api{
             $this->error('查无此文章');
         }
         $info = Ethnography::alias('ea')
-            ->join('family_people p','p.user_id = ea.user_id','left')
+//            ->join('family_people p','p.user_id = ea.user_id','left')
             ->where(['ea.id' =>$article_id])
-            ->field("ea.*,p.name,p.photo,p.address,FROM_UNIXTIME(ea.createtime,'%Y-%m-%d %T') as createtime")
+            ->field("ea.*,FROM_UNIXTIME(ea.createtime,'%Y-%m-%d %T') as createtime")
             ->find();
+        if($info['user_id']){
+            $fpeople=Db::name('family_people')->where(['user_id' =>$info['user_id']])->find();
+            $info['name'] = $fpeople ? $fpeople['name']:'';
+            $info['photo'] = $fpeople?$fpeople['photo']:'';
+            $info['address'] = $fpeople?$fpeople['address']:'';
+        }
         $collect = Collect::where(['article_id' =>$article_id,'user_id' =>$this->auth->id])->find();
         if($collect && $collect['status'] == 1){
             $info['ca_status'] = 1;