level挪到sys库里

app/admin/controller/Base.php

@@ -43,22 +43,28 @@ class Base extends \app\BaseController
         }
         $this->uid=$effetc['data']['id']??"";
         $this->uname=$effetc['data']['nickname']??"";
+        $this->level=$effetc['data']['level'];
         $where=[];
         if($companyNo!=""){
             $where=["companyNo"=>$companyNo];
         }
-        $role = Db::name("user_role")->where(["uid"=>$this->uid,"is_del"=>0])->where($where)->findOrEmpty();
-        if(empty($role)){
-            return error_show(101,"账户已禁用");
-        }
+        $user_role = Db::name("user_role")
+            ->where(["uid"=>$this->uid,"is_del"=>0])
+            ->where($where)
+            ->findOrEmpty();
+        if(empty($user_role)) return error_show(101,"账户已禁用");
 
-        $this->roleid=$role['roleid'];
-        $level =Db::name("role")->where(["id"=>$role['roleid']])->find();
-        if($role['status']==0 || $level['status']==0 ){
-            $this->level='';
-        }else{
-            $this->level=$level['level']>1 ?2 :($level['level']??1);
-        }
+
+        $this->roleid=$user_role['roleid'];
+//        $role =Db::name("role")
+//            ->field('id,is_allow_see_price,status')
+//            ->where(["id"=>$user_role['roleid']])
+//            ->findOrEmpty();
+//        if($role['status']==0 || $role['status']==0 ){
+//            $this->level='';
+//        }else{
+//            $this->level=$level['level']>1 ?2 :($level['level']??1);
+//        }
 //        return ["code"=>0,"message"=>"验证通过"];
     }
 

app/admin/controller/User.php

@@ -41,14 +41,14 @@ class User extends Base
 
         $roleinfo = Db::name('role')
             ->where(['id' => $role['roleid']])
-            ->field('role_name,level')
+            ->field('role_name')
             ->find();
 
         //数据合并
         $data = array_merge($rs['data'], [
             'role_name' => $roleinfo['role_name'] ?? '',
             'company_name' => $company_name ?? '',
-            'role_level' => $roleinfo['level'] ?? '',
+            'role_level' => $rs['data']['level'] ?? '',
             'role_id' => $role['roleid'] ?? '',
             'companyNo' => $role['companyNo'] ?? '',
             'company_type' => $role['company_type'] ?? '',

app/admin/controller/UserCompanyBasic.php

@@ -14,19 +14,9 @@ class UserCompanyBasic extends Base
     public function getList()
     {
 
-        $param = $this->request->only(['nickname' => '', 'username' => '', 'status' => '', 'page' => 1, 'size' => 10,'islevel'=>2,'relaComNo'=>''], 'post', 'trim');
-
-        //排除超管账号
-        $where=[['a.is_del','=',0]];
-        if($param['relaComNo'] != '') $where[]=['a.companyNo','=',$param['relaComNo']];
-        $uid =Db::name("user_role")
-            ->alias("a")
-            ->leftJoin("role b","a.roleid=b.id")
-            ->where([["b.level","=",1],["a.is_del","=",0]])
-            ->where($where)
-            ->column("uid");
-        if ($param['islevel'] == 1) $param['uid'] = $uid;
-        else $param['nuid'] = $uid;
+        $param = $this->request->only(['nickname' => '', 'username' => '', 'status' => '', 'page' => 1, 'size' => 10], 'post', 'trim');
+
+        $param['islevel'] = 2;//排除超管账号
 
         $userCommon = new UserCommon();
 
@@ -68,17 +58,17 @@ class UserCompanyBasic extends Base
         $userCommon = new UserCommon();
         $rs = $userCommon->handle('userCompanyBasicAdd', $param);
 
-        if(!isset($rs['code']) || $rs['code']!=0) return json_show($rs['code'], $rs['message'], $rs['data']);
-        else{
+        if (!isset($rs['code']) || $rs['code'] != 0) return json_show($rs['code'], $rs['message'], $rs['data']);
+        else {
 
             Db::startTrans();
-            try{
+            try {
                 $date = date('Y-m-d H:i:s');
-                $insert_data=[];
+                $insert_data = [];
                 foreach ($param['companyArr'] as $company) {
                     $insert_data[] = [
                         'uid' => $rs['data']['uid'],
-                        'nickname'=>$param['nickname'],
+                        'nickname' => $param['nickname'],
                         'roleid' => $company['roleid'],
                         'companyNo' => $company['companyCode'],
                         'company_type' => $company['company_type'],
@@ -95,9 +85,9 @@ class UserCompanyBasic extends Base
 
                 Db::commit();
                 return json_show($rs['code'], $rs['message'], $rs['data']);
-            }catch (Exception $exception){
+            } catch (Exception $exception) {
                 Db::rollback();
-                return json_show(1004,'账户注册失败,'.$exception->getMessage());
+                return json_show(1004, '账户注册失败,' . $exception->getMessage());
             }
         }
     }
@@ -150,7 +140,8 @@ class UserCompanyBasic extends Base
     }
 
     //详情
-    public function info(){
+    public function info()
+    {
 
         $param = $this->request->only(['id'], 'post', 'trim');