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

application/api/controller/FamilyTree.php

@@ -12,6 +12,7 @@ use app\lib\model\FamilyModel;
 use app\lib\model\FamilyPeopleModel;
 use app\lib\model\FamilyTreeMateModel;
 use app\lib\model\FamilyTreeModel;
+use app\lib\model\SurnameModel;
 use app\lib\service\FamilyTreeService;
 use fast\Tree;
 use think\Db;
@@ -629,6 +630,17 @@ class FamilyTree extends Api
      */
     public function celebrityList(){
         $page = $this->request->param('page',1);
+        $type = $this->request->param('type',1);
+        $map['type'] = 2;
+        $map['status'] = 1;
+        if($type == 2){//同姓
+            $Surname=SurnameModel::where(["ID"=>$this->auth->surname_id])->value("Surname");
+            $map['surname'] = $Surname;
+        }else if($type == 3){//同省
+            $map['province_id'] = $this->auth->province_id;
+        }else if($type == 4){//同城
+            $map['city_id'] = $this->auth->city_id;
+        }
         $data=FamilyPeopleModel::where(['type'=>2,'status'=>1])->field("*")->page($page)->limit(10)->order("ranking desc,id desc")->select();
         $this->success("",$data);
     }