我的激活码

application/api/controller/Family.php

@@ -68,7 +68,7 @@ class Family extends Api
             $data=FamilyTreeModel::claimFamilyPeople(['ft1.name'=>$name,'ft2.name'=>$parent_name,'ft3.name'=>$grandpa_name]);
             $list=[];
             if($type==2){
-               $family_id= NameCardModel::where(['activation_code'=>$activation_code,'user_id'=>0])->column("family_id");
+               $family_id= NameCardModel::where(['activation_code'=>$activation_code,'user_id'=>0])->value("family_id");
                foreach ($data as $key=>$val){
                    if ($val['family_id'] == $family_id){
                        array_push($list,$val);

application/api/controller/FamilyTree.php

@@ -701,6 +701,19 @@ class FamilyTree extends Api
         $this->success("审核成功");
     }
 
+    /**
+     * 我创建的族员
+     */
+    public function myCreateFamilyPeople(){
+        $page=$this->request->param("page",1);
+        $skeyword=$this->request->param("skeyword");
+        $map["ft.create_user_id"] =$this->auth->id;
+        if(!empty($skeyword)){
+            $map["ft.name"] = ["like","%".$skeyword."%"];
+        }
+        $list=FamilyTreeModel::myCreateFamilyPeople($map,$page,$this->pageSize);
+        $this->success("",$list);
+    }
 
 
 

application/lib/model/FamilyTreeModel.php

@@ -206,4 +206,19 @@ ORDER BY
         return $data;
     }*/
 
+    /**
+     * 查询我创建的族员
+     */
+    public static function myCreateFamilyPeople($where,$page,$pageSize=10){
+        $data=self::alias("ft")
+            ->join("family_people fp","ft.people_id=fp.id","LEFT")
+            ->field("ft.id,ft.name,ft.photo,ft.sex,ft.people_id,fp.activation_code")
+            ->where($where)
+            ->page($page)
+            ->limit($pageSize)
+            ->order("ft.parent_id asc,ft.id asc")
+            ->select();
+        return $data;
+    }
+
 }
\ No newline at end of file