|
|
@@ -197,7 +197,7 @@ class User extends BaseController{
|
|
|
return app_show(1002,"员工信息不存在");
|
|
|
}
|
|
|
$data = $userinfo['data'];
|
|
|
- $where=[["uid","=", $data['id']],["status","=",1],["is_del","=",0]];
|
|
|
+ $where=[["uid","=", $data['id']],["is_del","=",0]];
|
|
|
if($post['relaComNo']!=""){
|
|
|
$where[]=["companyNo","=",$post['relaComNo']];
|
|
|
}else{
|
|
|
@@ -213,7 +213,7 @@ class User extends BaseController{
|
|
|
if(!empty($data['company_relaton'])){
|
|
|
$roleArr = Db::name("user_role")->alias("a")
|
|
|
->leftJoin("role b","a.roleid=b.id")
|
|
|
- ->where(["a.status"=>1,"a.is_del"=>0,"a.uid"=>$data['id']])
|
|
|
+ ->where(["a.is_del"=>0,"a.uid"=>$data['id']])
|
|
|
->column("role_name,roleid,a.status,b.level","a.companyNo");
|
|
|
foreach ($data['company_relaton'] as &$item){
|
|
|
$item['roleid'] =isset($roleArr[$item['companyCode']])?$roleArr[$item['companyCode']]['roleid']:"";
|
