圈子

application/api/controller/Family.php

@@ -82,7 +82,7 @@ class Family extends Api
             }
             $data =array_unique(call_user_func_array("array_merge",$arr));
         }
-        $arr = [];
+        $family_arr = [];
         foreach ($data as $key=>$val){
             if($val['village_id']){
                 $addr=Db::name('addr_village')->where(['village_code'=>$val['village_id']])->find();
@@ -103,10 +103,10 @@ class Family extends Api
             }
                 $data[$key]['agent_realname'] = array_unique($array);
             if($val['type'] == 2){//有族谱就显示族谱
-                $arr[]=$val;
+                $family_arr[]=$val;
             }
-            if(!$arr && $val['type'] == 1){
-                $arr[] = $val;
+            if(!$family_arr && $val['type'] == 1){
+                $family_arr[] = $val;
             }
         }