base优化

app/admin/controller/Base.php

@@ -45,16 +45,16 @@ class Base extends \app\BaseController
 //        }
         $effetc = VerifyTokens($this->post['token']);
         if (!empty($effetc) && $effetc['code'] != 0) return error_show($effetc['code'], $effetc['message']);
-        if ((isset($this->post['supplierNo'])) && ($this->post['supplierNo'] != '') && !in_array($this->post['supplierNo'], array_column($effetc['data']['company_relaton'], 'companyCode'))) return error_show(1004, '尚未关联企业');
+//        if ((isset($this->post['supplierNo'])) && ($this->post['supplierNo'] != '') && !in_array($this->post['supplierNo'], array_column($effetc['data']['company_relaton'], 'companyCode'))) return error_show(1004, '尚未关联企业');
 
         $this->uid = isset($effetc['data']['id']) ? $effetc['data']['id'] : "";
         $this->uname = isset($effetc['data']['nickname']) ? $effetc['data']['nickname'] : "";
 
-        $where_role = [['a.uid', '=', $this->uid], ['a.is_del', '=', 0], ['a.status', '=', 1]];
+        $where_role = [['a.uid', '=', $this->uid], ['a.is_del', '=', 0]];
         if (isset($this->post['supplierNo']) && $this->post['supplierNo'] != '') {
             $where_role[] = ['a.companyNo', '=', $this->post['supplierNo']];
-            $where_role[] = ['b.level', '<>', 1];
-        } else $where_role[] = ['b.level', '=', 1];
+//            $where_role[] = ['b.level', '<>', 1];
+        } //else $where_role[] = ['b.level', '=', 1];
 
         $role = Db::name('user_role')
             ->alias('a')
@@ -63,7 +63,7 @@ class Base extends \app\BaseController
             ->where($where_role)
             ->findOrEmpty();
 
-        if (empty($role) || $role['status'] == 0) return error_show(102, '该企业尚未开通对应角色');
+        if (empty($role) || $role['status'] == 0) return error_show(102, '账户已禁用');
 
         $this->roleid = $role['roleid'];//权限id
         $this->level = $role['level'];//权限等级