ad

app/admin/controller/User.php

@@ -92,16 +92,16 @@ class User extends BaseController{
             return app_show($userinfo['code'],$userinfo['msg']);
         }
         $data = $userinfo['data']['list'];
-        $roleArr = Db::name("user_role")->alias("a")
-        ->leftJoin("role b","a.roleid=b.id")
-        ->where($where)
-        ->column("role_name,roleid,a.status,b.level","a.companyNo");
         $list=[];
         foreach ($data as $value){
-            $value['roleid']=$roleArr[$value['companyCode']]['roleid']??"";
-            $value['com_status']=$roleArr[$value['companyCode']]['status']??"";
-            $value["role_name"] =$roleArr[$value['companyCode']]['role_name']??"";
-            $value["role_level"] =$roleArr[$value['companyCode']]['level']??"";
+        	$roleArr = Db::name("user_role")->alias("a")
+        ->leftJoin("role b","a.roleid=b.id")
+        ->where(["uid"=>$value['id'],"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["role_name"] =$roleArr['role_name']??"";
+            $value["role_level"] =$roleArr['level']??"";
             $list[]=$value;
         }
         return app_show(0,"获取成功",["list"=>$list,"count"=>$userinfo['data']["count"]]);
@@ -224,8 +224,7 @@ class User extends BaseController{
 	    */
 	    public  function  setRole(){
 	        $post=$this->request->only(["id"=>"","nickname"=>"","mobile"=>"","relaComNo"=>"","companyNo"=>"","roleid"=>"",
-	        "token"=>""],
-	        "post","trim");
+	        "token"=>""],"post","trim");
 
 	        $valide=Validate::rule([
 	        	"id|账户ID"=>"require|number|gt:0",
@@ -307,7 +306,7 @@ class User extends BaseController{
 	                $userrole['companyNo'] = $companyNo;
 	                $userrole['company_type'] =$company["type"]==3?2:1;
 	                $userrole['updatetime'] = date("Y-m-d H:i:s");
-	                $up=Db::name("user_role")->save($userrole);
+	                $up=Db::name("user_role")->where(["uid"=>$post['id'],"companyNo"=>$companyNo,"is_del"=>0])->save($userrole);
 	            }
 			    $saveinfo =[
 						"id"=>$post['id'],