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

application/api/controller/FamilyTree.php

@@ -449,7 +449,7 @@ class FamilyTree extends Api
             && ($people['user_id'] == $this->auth->id || ($familyTree && $familyTree['create_user_id'] == $this->auth->id)
             || ($familyTreeMate && $familyTreeMate['create_user_id'] == $this->auth->id ))){
 
-            $this->success("该账户无权限！");
+            $this->error("该账户无权限！");
 
         }
 
@@ -482,7 +482,7 @@ class FamilyTree extends Api
 
         if(!in_array($this->auth->id,explode(",",$family['rw_user_id']))){
 
-            $this->success("该账户无权限！");
+            $this->error("该账户无权限！");
 
         }
 
@@ -533,7 +533,7 @@ class FamilyTree extends Api
 
         if(!in_array($this->auth->id,explode(",",$family['rw_user_id']))){
 
-            $this->success("该账户无权限！");
+            $this->error("该账户无权限！");
 
         }
 
@@ -623,4 +623,41 @@ class FamilyTree extends Api
 
         $this->success("加入成功,去支付",['info' =>$pay_info->toArray()]);
     }
+
+    /**
+     * 审核列表
+     */
+    public function auditPeopleList(){
+        $family_id=$this->request->param("family_id");//族谱id
+
+        $FamilyTree=FamilyModel::myFamilyTreeList(["ft.family_id" =>$family_id,'audit'=>0]);
+
+        $this->success("",$FamilyTree);
+    }
+
+    public function auditPeople(){
+        $family_id=$this->request->param("family_id");//族谱id
+
+        $people_id=$this->request->param("people_id");
+
+        $audit=$this->request->param("audit",1);
+
+        $family=FamilyModel::dataInfo(['id'=>$family_id]);
+
+        if(!in_array($this->auth->id,explode(",",$family['rw_user_id']))){
+
+            $this->error("该账户无权限！");
+
+        }
+        $status=$audit ==1?1:0;
+
+        FamilyPeopleModel::dataUpdate(['id'=>$people_id],['status'=>$status,'audit'=>$status]);
+        
+        $this->success("审核成功");
+    }
+
+
+
+
+
 }
\ No newline at end of file