Merge branch 'dev' of http://120.46.155.214:3000/wugg/cxinv into dev

app/admin/controller/User.php

@@ -559,7 +559,7 @@ class User extends BaseController{
             }
 
         } else {
-            $userrole = [];
+
             if ($post['relaComNo'] != "") {
                 $company = Db::name("supplier_info")->where(["code" => $post['relaComNo']])->find();
                 if ($company) {
@@ -584,42 +584,60 @@ class User extends BaseController{
                         "company_type" => 0,
                         "is_main" => 1,
                     ];
-                    $userrole = [
-                        "uid" => 0,
-                        "nickname" => '',
-                        "roleid" => 0,
-                        "companyNo" => '',
-                        "company_type" => '',
-                        "status" => 1,
-                        "is_main" => 1,
-                        "is_del" => 0,
-                        "addtime" => date("Y-m-d H:i:s"),
-                        "updatetime" => date("Y-m-d H:i:s"),
-                    ];
+
                 }
             }
             $nam = addacount($post);
             if (!isset($nam['code']) || $nam['code'] != 0) {
                 return error_show(1004, $nam['message']);
             }
-            if (!empty($userrole)) {
-                $userrole['uid'] = $nam['data']["userid"];
-                $userrole['nickname'] = $nam['data']["nickname"];
 
+            $userrole = [];
+            foreach ($post['companyArr'] as $company) {
                 switch ($post['level']) {
                     case 1:
-                        $userrole['roleid'] = env('default_admin_addcount_role_id', 1);
+                        $userrole[] = [
+                            "uid" => $nam['data']["userid"],
+                            "nickname" => $nam['data']["nickname"],
+                            "roleid" => env('default_admin_addcount_role_id', 1),
+                            "companyNo" => $company['companyCode'],
+                            "company_type" => 0,
+                            "status" => 1,
+                            "is_main" => 1,
+                            "is_del" => 0,
+                            "addtime" => date("Y-m-d H:i:s"),
+                            "updatetime" => date("Y-m-d H:i:s"),
+                        ];
                         break;
                     case 3:
-                        $userrole['roleid'] = env('default_supplier_addcount_role_id', 90);//需要专门为供应商账号指定一个默认的角色id，要同步到采销;
+                        $userrole[] = [
+                            "uid" => $nam['data']["userid"],
+                            "nickname" => $nam['data']["nickname"],
+                            "roleid" => env('default_supplier_addcount_role_id', 90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销;
+                            "companyNo" => $company['companyCode'],
+                            "company_type" => '2',
+                            "status" => 1,
+                            "is_main" => 1,
+                            "is_del" => 0,
+                            "addtime" => date("Y-m-d H:i:s"),
+                            "updatetime" => date("Y-m-d H:i:s"),
+                        ];
                         break;
                 }
+            }
+//            if (!empty($userrole)) {
+//                $userrole['uid'] = $nam['data']["userid"];
+//                $userrole['nickname'] = $nam['data']["nickname"];
 
+
+            if ($userrole) {
                 $up = Db::name("user_role")->insert($userrole);
                 if ($up == false) {
-                    return error_show(1004, '账户超管角色分配失败');
+                    return error_show(1004, '账户角色分配失败');
                 }
             }
+
+//            }
         }
 
         return $post['id'] == "" ? app_show(0, "账户新建成功") : app_show(0, "账户编辑成功");