Skip to content

Z
zhupu
Commit ca6e9c38 authored by sugar's avatar sugar
Browse files
Options

圈子

parent 00097ff1
Pipeline #760 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 4 additions and 4 deletions
      application/api/controller/Family.php
      View file @ ca6e9c38
      ...@@ -82,7 +82,7 @@ class Family extends Api ...@@ -82,7 +82,7 @@ class Family extends Api
      } }
      $data =array_unique(call_user_func_array("array_merge",$arr)); $data =array_unique(call_user_func_array("array_merge",$arr));
      } }
      $family_arr = []; $arr = [];
      foreach ($data as $key=>$val){ foreach ($data as $key=>$val){
      if($val['village_id']){ if($val['village_id']){
      $addr=Db::name('addr_village')->where(['village_code'=>$val['village_id']])->find(); $addr=Db::name('addr_village')->where(['village_code'=>$val['village_id']])->find();
      ...@@ -103,10 +103,10 @@ class Family extends Api ...@@ -103,10 +103,10 @@ class Family extends Api
      } }
      $data[$key]['agent_realname'] = array_unique($array); $data[$key]['agent_realname'] = array_unique($array);
      if($val['type'] == 2){//有族谱就显示族谱 if($val['type'] == 2){//有族谱就显示族谱
      $family_arr[]=$val; $arr[]=$val;
      } }
      if(!$family_arr && $val['type'] == 1){ if(!$arr && $val['type'] == 1){
      $family_arr[] = $val; $arr[] = $val;
      } }
      } }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment