Commit 813939e3 authored by sugar's avatar sugar

圈子

parent ca6e9c38
Pipeline #761 canceled with stages
...@@ -293,6 +293,7 @@ class User extends Base ...@@ -293,6 +293,7 @@ class User extends Base
$first['ext5'] = '依'; $first['ext5'] = '依';
$first['type'] = '本人'; $first['type'] = '本人';
$first['sex'] = $sex; $first['sex'] = $sex;
$first['user_id'] = $create_user_id;
$first_mate['sex'] = $sex == 1 ? 2 : 1; $first_mate['sex'] = $sex == 1 ? 2 : 1;
$first_mate['name']=$params['realname'].'配偶'; $first_mate['name']=$params['realname'].'配偶';
break; break;
...@@ -309,7 +310,6 @@ class User extends Base ...@@ -309,7 +310,6 @@ class User extends Base
$first['is_pay'] = 1; $first['is_pay'] = 1;
$first['surname'] = $params['family_name']; $first['surname'] = $params['family_name'];
$first['firstname'] = $first['name']; $first['firstname'] = $first['name'];
$first['user_id'] = $create_user_id;
$people=FamilyTreeService::addFamilyPeople($first,$family_id); $people=FamilyTreeService::addFamilyPeople($first,$family_id);
$first['family_id'] = $family_id; $first['family_id'] = $family_id;
$first['level'] = $level;//处于第三代 $first['level'] = $level;//处于第三代
...@@ -321,13 +321,14 @@ class User extends Base ...@@ -321,13 +321,14 @@ class User extends Base
unset($first['is_pay']); unset($first['is_pay']);
unset($first['surname']); unset($first['surname']);
unset($first['firstname']); unset($first['firstname']);
unset($first['user_id']); if(isset($first['user_id'])){
unset($first['user_id']);
}
$tree=FamilyTreeModel::dataAdd($first); $tree=FamilyTreeModel::dataAdd($first);
//添加配偶 //添加配偶
$first_mate['is_pay'] = 1; $first_mate['is_pay'] = 1;
$first_mate['surname'] = $params['family_name']; $first_mate['surname'] = $params['family_name'];
$first_mate['firstname'] = $first_mate['name']; $first_mate['firstname'] = $first_mate['name'];
$first_mate['user_id'] = $create_user_id;
$mate_people=FamilyTreeService::addFamilyPeople($first_mate,$family_id); $mate_people=FamilyTreeService::addFamilyPeople($first_mate,$family_id);
$first_mate['family_tree_id']=$tree->id; $first_mate['family_tree_id']=$tree->id;
$first_mate['create_user_id']=$create_user_id; $first_mate['create_user_id']=$create_user_id;
...@@ -336,7 +337,6 @@ class User extends Base ...@@ -336,7 +337,6 @@ class User extends Base
unset($first_mate['is_pay']); unset($first_mate['is_pay']);
unset($first_mate['surname']); unset($first_mate['surname']);
unset($first_mate['firstname']); unset($first_mate['firstname']);
unset($first_mate['user_id']);
$mate_tree=FamilyTreeMateModel::dataAdd($first_mate); $mate_tree=FamilyTreeMateModel::dataAdd($first_mate);
Db::commit(); Db::commit();
}catch (Exception $e){ }catch (Exception $e){
......
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