暂存

app/admin/controller/Base.php

@@ -33,7 +33,7 @@ class Base extends \app\BaseController
         //这个地方不能用return json_show()方法，无法阻止代码继续执行
         $val = Validate::rule([
             'token'=>'require',
-            'supplierNo'=>'require|length:18',
+            'supplierNo'=>'length:18',
         ]);
 
         if(!$val->check($this->post)) return error_show(1004,$val->getError());
@@ -44,7 +44,7 @@ class Base extends \app\BaseController
 //        }
         $effetc = VerifyTokens($this->post['token']);
         if(!empty($effetc) && $effetc['code']!=0) return error_show($effetc['code'], $effetc['message']);
-        if(!in_array($this->post['supplierNo'],array_column($effetc['data']['company_relaton'],'companyCode'))) return error_show(1004,'该企业尚未关联');
+        if(($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']:"";
@@ -58,7 +58,7 @@ class Base extends \app\BaseController
         if(empty($role) || $role['status']==0) return error_show(102,'该企业尚未开通对应角色');
 
         $this->roleid = $role['roleid'];//权限id
-        $this->level = $role['level'];//权限id
+        $this->level = $role['level'];//权限等级
     }
 
 

app/admin/controller/User.php

@@ -3,14 +3,13 @@ declare (strict_types=1);
 
 namespace app\admin\controller;
 
-use app\BaseController;
 use think\facade\Db;
 use app\admin\model\ActionLog;
 use think\facade\Validate;
 use app\admin\common\User as CommonUser;
 
 //运营账户
-class User extends BaseController
+class User extends Base
 {
     //登录
     public function login()

app/admin/route/app.php

@@ -144,6 +144,10 @@ Route::rule("passset", "admin/User/setPwd");
 Route::rule("userinfobyid", "admin/User/info");
 Route::rule("usergetinfo", "admin/User/getinfo");
 
+//【公司账号】
+Route::rule("userCompanyAdd", "admin/UserCompany/add");
+
+
 Route::rule("sharelist", "admin/Share/index");
 Route::rule("shareadd", "admin/Share/create");
 Route::rule("sharesave", "admin/Share/save");