Merge branch 'dev_wf' of wugg/cxinv into dev

app/admin/controller/User.php

@@ -378,26 +378,36 @@ class User extends BaseController{
             if ($roleinfo['level'] == 1) return error_show(1002, "超管级别角色不允许设置");
 
         }
-        if ($this->level == 1) {
+
+
+        //查询该账户的详情
+        $userinfo = GetInfoById($post['token'],['id'=>$post['id']]);
+        if (!isset($userinfo['code']) || $userinfo['code'] != 0) return error_show($userinfo['code'], $userinfo['message'], $userinfo['data']);
+        $level = $userinfo['data']['level'];
+
+        if ($level == 1) return error_show(1004, '超管账号不允许设置角色');
+
+
+        if ($level == 1) {
             $companyNo = isset($post['companyNo']) && $post['companyNo'] !== '' ? trim($post['companyNo']) : "";
         } else {
             $companyNo = isset($post['relaComNo']) && $post['relaComNo'] !== '' ? trim($post['relaComNo']) : "";
         }
 
-        if ($this->level !== 3) {
+        if ($level== 2) {
             if ($companyNo == "") return error_show(1004, "业务公司编号不能为空");
             $company = Db::name("supplier_info")->field('code')->where(["code" => $companyNo])->find();
             if ($company == false) return error_show(1004, "业务公司不存在");
         }
 
-        $isSuper = Db::name("user_role")->alias("a")
-            ->leftJoin("role b", "a.roleid=b.id")
-            ->where(["a.uid" => $post['id'], "a.is_del" => 0, "b.level" => 1])
-            ->findOrEmpty();
-        if (!empty($isSuper)) return error_show(1002, "超管账户不允许设置其他角色");
+//        $isSuper = Db::name("user_role")->alias("a")
+//            ->leftJoin("role b", "a.roleid=b.id")
+//            ->where(["a.uid" => $post['id'], "a.is_del" => 0, "b.level" => 1])
+//            ->findOrEmpty();
+//        if (!empty($isSuper)) return error_show(1002, "超管账户不允许设置其他角色");
 
         $userrole_where = ["uid" => $post['id'], "is_del" => 0];
-        if ($this->level !== 3) $userrole_where['companyNo'] = $companyNo;
+        if ($level == 2) $userrole_where['companyNo'] = $companyNo;
 
         $userrole = Db::name("user_role")
             ->field('id')
@@ -412,8 +422,8 @@ class User extends BaseController{
                     "uid" => $post['id'],
                     "roleid" => $post['roleid'],
                     "nickname" => $post['nickname'],
-                    "companyNo" => $this->level == 2 ? $companyNo : '',
-                    "company_type" => $this->level == 2 ? ($company["type"] == 3 ? 2 : 1) : 0,
+                    "companyNo" => $level == 2 ? $companyNo : '',
+                    "company_type" => $level == 2 ? ($company["type"] == 3 ? 2 : 1) : 0,
                     "is_main" => $ismain ? 0 : 1,
                     "status" => 1,
                     "addtime" => date("Y-m-d H:i:s"),
@@ -421,7 +431,7 @@ class User extends BaseController{
                 ];
 
                 //level 为1,3时，角色不和公司关联，所以不需要操作
-                if ($this->level == 2) {
+                if ($level == 2) {
                     $companyarr = [
                         [
                             "companyCode" => $company["code"],
@@ -443,8 +453,8 @@ class User extends BaseController{
             } else {
                 $userrole['roleid'] = $post['roleid'];
                 $userrole['nickname'] = $post['nickname'];
-                $userrole['companyNo'] = $this->level == 2 ? $companyNo : '';
-                $userrole['company_type'] = $this->level == 2 ? ($company["type"] == 3 ? 2 : 1) : 0;
+                $userrole['companyNo'] = $level == 2 ? $companyNo : '';
+                $userrole['company_type'] = $level == 2 ? ($company["type"] == 3 ? 2 : 1) : 0;
                 $userrole['updatetime'] = date("Y-m-d H:i:s");
                 $up = Db::name("user_role")->where(["id" => $userrole['id'], "is_del" => 0])->save($userrole);
             }