|
@@ -40,8 +40,12 @@ class User extends BaseController
|
|
|
$depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
|
|
|
$value['depart']="";
|
|
|
if(!empty($depart)){
|
|
|
- $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("name");
|
|
|
- $value['depart'] = implode(",",$deparname);
|
|
|
+ // $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("name");
|
|
|
+ $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("id,name,depart_link");
|
|
|
+ array_walk($deparname,function (&$v){
|
|
|
+ $v['depart'] = array_filter(explode("-",$v['depart_link'])) ;
|
|
|
+ });
|
|
|
+ $value['depart'] = $deparname;
|
|
|
}
|
|
|
$list[]=$value;
|
|
|
}
|
|
@@ -78,7 +82,7 @@ class User extends BaseController
|
|
|
$data['depart']="";
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")->select();
|
|
|
- array_walk($deparname,function ($v){
|
|
|
+ array_walk($deparname,function (&$v){
|
|
|
$v = array_filter(explode("-",$v['depart_link'])) ;
|
|
|
});
|
|
|
$data['depart'] = $deparname;
|
|
@@ -142,8 +146,9 @@ class User extends BaseController
|
|
|
$value['depart']="";
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
|
|
|
- ->select();
|
|
|
- array_walk($deparname,function ($v){
|
|
|
+ ->select()->toArray();
|
|
|
+
|
|
|
+ array_walk($deparname,function (&$v){
|
|
|
$v = array_filter(explode("-",$v['depart_link'])) ;
|
|
|
});
|
|
|
$value['depart'] = $deparname;
|
|
@@ -190,8 +195,8 @@ class User extends BaseController
|
|
|
$value['depart']="";
|
|
|
if(!empty($depart)){
|
|
|
$deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
|
|
|
- ->select();
|
|
|
- array_walk($deparname,function ($v){
|
|
|
+ ->select()->toArray();
|
|
|
+ array_walk($deparname,function (&$v){
|
|
|
$v = array_filter(explode("-",$v['depart_link'])) ;
|
|
|
});
|
|
|
$value['depart'] = $deparname;
|