|
@@ -120,7 +120,7 @@ class User extends BaseController{
|
|
->where(["uid"=>$value['id'],"a.companyNo"=>$value['companyCode'],"is_del"=>0])
|
|
->where(["uid"=>$value['id'],"a.companyNo"=>$value['companyCode'],"is_del"=>0])
|
|
->field("role_name,roleid,a.status,b.level")->findOrEmpty();
|
|
->field("role_name,roleid,a.status,b.level")->findOrEmpty();
|
|
$value['roleid']=$roleArr['roleid']??"";
|
|
$value['roleid']=$roleArr['roleid']??"";
|
|
- $value['status']=$roleArr['status']??0;
|
|
|
|
|
|
+ $value['status']=$value['status']==1?($roleArr['status']??0) :0;
|
|
$value["role_name"] =$roleArr['role_name']??"";
|
|
$value["role_name"] =$roleArr['role_name']??"";
|
|
$value["role_level"] =$roleArr['level']??"";
|
|
$value["role_level"] =$roleArr['level']??"";
|
|
$list[]=$value;
|
|
$list[]=$value;
|
|
@@ -236,7 +236,7 @@ class User extends BaseController{
|
|
* @throws \think\db\exception\DbException
|
|
* @throws \think\db\exception\DbException
|
|
* @throws \think\db\exception\ModelNotFoundException
|
|
* @throws \think\db\exception\ModelNotFoundException
|
|
*/
|
|
*/
|
|
- public function setStatus(){
|
|
|
|
|
|
+ public function setStatus(){
|
|
$post =$this->request->only(["id"=>"","status"=>"","relaComNo"=>"","companyNo"=>"","token"=>""],"post");
|
|
$post =$this->request->only(["id"=>"","status"=>"","relaComNo"=>"","companyNo"=>"","token"=>""],"post");
|
|
$valide =Validate::rule([
|
|
$valide =Validate::rule([
|
|
'id|账户ID' => 'require|number|gt:0',
|
|
'id|账户ID' => 'require|number|gt:0',
|
|
@@ -246,25 +246,12 @@ class User extends BaseController{
|
|
]);
|
|
]);
|
|
if($valide->check($post)==false) return error_show(1004,$valide->getError());
|
|
if($valide->check($post)==false) return error_show(1004,$valide->getError());
|
|
$message = $post['status']==1?"启用":"禁用";
|
|
$message = $post['status']==1?"启用":"禁用";
|
|
- if($this->level==1){
|
|
|
|
- $companyNo = isset($post['companyNo'])&&$post['companyNo']!=='' ? trim($post['companyNo']) :"";
|
|
|
|
- }else{
|
|
|
|
- $companyNo = isset($post['relaComNo'])&&$post['relaComNo']!=='' ? trim($post['relaComNo']) :"";
|
|
|
|
- }
|
|
|
|
- $userinfo =Db::name("user_role")->where(["uid"=>$post['id'],"companyNo"=>$companyNo,"is_del"=>0])
|
|
|
|
- ->find();
|
|
|
|
- if($userinfo==false){
|
|
|
|
- return error_show(1005,"未找到有关账户信息");
|
|
|
|
- }else{
|
|
|
|
- $userinfo['status']=$post['status'];
|
|
|
|
- $userinfo['updatetime']=date("Y-m-d H:i:s");
|
|
|
|
- $sa=Db::name("user_role")->save($userinfo);
|
|
|
|
- }
|
|
|
|
- if($sa==false){
|
|
|
|
- return error_show(1005,"{$message}失败");
|
|
|
|
- }else{
|
|
|
|
- return app_show(0,"{$message}成功");
|
|
|
|
- }
|
|
|
|
|
|
+ $condition=["id"=>$post['id'],"status"=>$post['status'],"token"=>$post['token']];
|
|
|
|
+ $ex=setStatus($condition);
|
|
|
|
+ if(!isset($ex['code'])||$ex['code']!=0){
|
|
|
|
+ return error_show(1004,$ex['message']);
|
|
|
|
+ }
|
|
|
|
+ return app_show(0,"{$message}成功");
|
|
}
|
|
}
|
|
|
|
|
|
//获取所有用户的信息
|
|
//获取所有用户的信息
|