Commit 16fd3c95 authored by wuxiaoli's avatar wuxiaoli

管理员查看修改权限

parent 3d926c39
......@@ -38,28 +38,25 @@ class FamilyTree extends Api
$family=FamilyModel::dataInfo(['id'=>$family_id]);
$family_tree_id=$this->request->param("family_tree_id");//查看某个人节点上一代,下三代含自己(4带)
$family_where = ["ft.family_id"=>$family_id];
if($people_id){
$family_where = ["fp.id"=>$people_id];
}
if(empty($family_tree_id)){
$map['ft.family_id']=$family_id;
if($keywords){
$family_where['ft.name'] = ['like',"%$keywords%"];
$familyTreePeople=FamilyTreeModel::myFamilyTreePeople($family_where);
if($familyTreePeople){
$family_tree_id=$familyTreePeople['id'];
}
$map['ft.name']=['like',"%$keywords%"];
}else if($people_id){
$map['fp.id']= $people_id;
}else{
$family_where['fp.user_id'] = $this->auth->id;
$familyTreePeople=FamilyTreeModel::myFamilyTreePeople($family_where);
if($familyTreePeople){
$family_tree_id=$familyTreePeople['id'];
}
$map['fp.user_id']= $this->auth->id;
}
$familyTreePeople=FamilyTreeModel::myFamilyTreePeople($map);
if($familyTreePeople){
$family_tree_id=$familyTreePeople['id'];
}
/*else if(!in_array($this->auth->id,explode(",",$family['rw_user_id']))){
///查看是否有权限
$myFamily=FamilyTreeModel::myFamilyTreePeople(["ft.family_id"=>$family_id,'fp.user_id'=>$this->auth->id]);
if(!in_array($this->auth->id,explode(",",$family['rw_user_id'])) && empty($myFamily) ){
$this->error("暂未查到您加入族谱信息");
}*/
}
////////////////管理员默认查看祖先代数
if(empty($family_tree_id)) $family_tree_id=FamilyTreeModel::where(['family_id'=>$family_id,'parent_id'=>0])->order("id asc")->value("id");
......@@ -198,6 +195,9 @@ class FamilyTree extends Api
$family=FamilyModel::dataInfo(['id'=>$params['family_id']]);
if(!in_array($this->auth->id,explode(",",$family['rw_user_id'])) && $family['type'] != 1 ){
$this->error("该账户无权限!");
}
$people=FamilyTreeService::addFamilyPeople($this->request->param());
......@@ -224,9 +224,14 @@ class FamilyTree extends Api
$family=FamilyModel::dataInfo(['id'=>$params['family_id']]);
if(!in_array($this->auth->id,explode(",",$family['rw_user_id'])) && $family['type'] != 1){
$this->error("该账户无权限!");
}
$people=FamilyTreeService::addFamilyPeople($this->request->param());
FamilyTreeModel::where(['family_id'=>$params['family_id']])->setInc("level");//修改代系
$params['people_id']=$people['id'];
$res=FamilyTreeModel::dataAdd($params);
......@@ -252,15 +257,23 @@ class FamilyTree extends Api
$params=self::verifyFamily();
$family=FamilyModel::dataInfo(['id'=>$params['family_id']]);
$params['parent_id']=$this->request->param("parent_id");//父亲id
if(empty($params['parent_id'])){
$this->error("请选择上级成员");
}
$family=FamilyModel::dataInfo(['id'=>$params['family_id']]);
$parentTree =FamilyTreeModel::dataInfo(['id'=>$params['parent_id']]);//节点父id
$parentPeople=FamilyPeopleModel::dataInfo(['id'=>$parentTree['people_id']]);//节点父id信息
if(!in_array($this->auth->id,explode(",",$family['rw_user_id'])) && $family['type'] != 1
&& ($parentTree['create_user_id'] == $this->auth->id || $parentPeople['user_id'] == $this->auth->id )){
$this->error("该账户无权限!");
}
$people=FamilyTreeService::addFamilyPeople($this->request->param());
$params['people_id']=$people['id'];
......@@ -290,15 +303,21 @@ class FamilyTree extends Api
$params=self::verifyFamily();
$params['family_tree_id']= $family_tree_id=$this->request->param("family_tree_id");//配偶id
unset($params['level']);
$hubbyFamilyTree=FamilyTreeModel::myFamilyTreePeople(['ft.id'=>$family_tree_id]);//配偶(丈夫)
$family=FamilyModel::dataInfo(['id'=>$params['family_id']]);
if(!in_array($this->auth->id,explode(",",$family['rw_user_id'])) && $family['type'] != 1
&& ($hubbyFamilyTree['create_user_id'] == $this->auth->id || $hubbyFamilyTree['people_user_id'] == $this->auth->id)){
$this->error("该账户无权限!");
}
if(isset($params['family_id'])) unset($params['family_id']);
$params['family_tree_id']= $family_tree_id=$this->request->param("family_tree_id");//配偶id
$people=FamilyTreeService::addFamilyPeople($this->request->param());
$params['people_id']=$people['id'];
......@@ -376,10 +395,6 @@ class FamilyTree extends Api
$this->error("该族谱不存在");
}
if(!in_array($this->auth->id,explode(",",$family['rw_user_id']))){
$this->error("该账户无权限!");
}
return $params;
}
......@@ -391,13 +406,6 @@ class FamilyTree extends Api
$family_id=$this->request->param("family_id");//族谱id
$family=FamilyModel::dataInfo(['id'=>$family_id]);
if(!in_array($this->auth->id,explode(",",$family['rw_user_id']))){
$this->success("该账户无权限!");
}
$surname=$this->request->param("surname");
$firstname=$this->request->param("firstname");
......@@ -432,14 +440,26 @@ class FamilyTree extends Api
$familyTree=FamilyTreeModel::dataInfo(['people_id'=>$people_id]);
$familyTreeMate=FamilyTreeMateModel::dataInfo(['people_id'=>$people_id]);
$family=FamilyModel::dataInfo(['id'=>$family_id]);
if(!in_array($this->auth->id,explode(",",$family['rw_user_id'])) && $family['type'] != 1
&& ($people['user_id'] == $this->auth->id || ($familyTree && $familyTree['create_user_id'] == $this->auth->id)
|| ($familyTreeMate && $familyTreeMate['create_user_id'] == $this->auth->id ))){
$this->success("该账户无权限!");
}
if($familyTree && ($familyTree['create_user_id'] == $this->auth->id || $people['user_id'] == $this->auth->id)){
FamilyTreeModel::dataUpdate(['people_id'=>$people_id],$params);
$res=FamilyTreeService::addFamilyPeople($this->request->param());
}
$familyTreeMate=FamilyTreeMateModel::dataInfo(['people_id'=>$people_id]);
if($familyTreeMate && ($familyTreeMate['create_user_id'] == $this->auth->id || $people['user_id'] == $this->auth->id)){
unset($params['level']);
FamilyTreeMateModel::dataUpdate(['people_id'=>$people_id],$params);
......
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