|
|
@@ -74,7 +74,7 @@ class User extends BaseController{
|
|
|
$where[]=["a.status","=",1];
|
|
|
$post['uid']= $uid;
|
|
|
}else{
|
|
|
- $post['nouid']=$uid;
|
|
|
+ $post['nuid']=$uid;
|
|
|
}
|
|
|
unset($post['status']);
|
|
|
}
|
|
|
@@ -85,10 +85,11 @@ class User extends BaseController{
|
|
|
if($post['islevel']==1){
|
|
|
$post['uid']= $uid;
|
|
|
}else{
|
|
|
- $post['nouid']=$uid;
|
|
|
+ $post['nuid']=$uid;
|
|
|
}
|
|
|
unset($post["islevel"]);
|
|
|
}
|
|
|
+// var_dump($post);
|
|
|
$userinfo=GetUserList($post);
|
|
|
if(empty($userinfo)||$userinfo['code']!=0){
|
|
|
return app_show($userinfo['code'],$userinfo['msg']);
|
|
|
@@ -101,7 +102,7 @@ class User extends BaseController{
|
|
|
->where(["uid"=>$value['id'],"a.companyNo"=>$value['companyCode'],"is_del"=>0])
|
|
|
->field("role_name,roleid,a.status,b.level")->findOrEmpty();
|
|
|
$value['roleid']=$roleArr['roleid']??"";
|
|
|
- $value['com_status']=$roleArr['status']??"";
|
|
|
+ $value['status']=$roleArr['status']??"";
|
|
|
$value["role_name"] =$roleArr['role_name']??"";
|
|
|
$value["role_level"] =$roleArr['level']??"";
|
|
|
$list[]=$value;
|
