Merge branch 'dev_wf' of wugg/cxinv into dev

app/admin/controller/User.php

@@ -660,23 +660,43 @@ class User extends BaseController{
         if ($validate->check($post) == false) return error_show(1004, $validate->getError());
 
         $rs = add_supplier_account($post);
-        if (!isset($rs['code']) || $rs['code'] != 0) return app_show(1004, $rs['message'],$rs['data']);
-
-        $up = Db::name("user_role")->insert([
-            "uid" => $rs['data']["userid"],
-            "nickname" => $rs['data']["nickname"],
-            "roleid" => env('default_supplier_addcount_role_id',90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销
-            "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"),
-        ]);
-        if ($up == false) return error_show(1004, '供应商账号分配角色失败');
+        if (!isset($rs['code']) || $rs['code'] != 0) return error_show($rs['code'], $rs['message'],$rs['data']);
+
+        $insert_data=[];
+        $date = date('Y-m-d H:i:s');
+        foreach ($post['companyArr'] as $company){
+            $insert_data[]=[
+                "uid" => $rs['data']["userid"],
+                "nickname" => $rs['data']["nickname"],
+                "roleid" => env('default_supplier_addcount_role_id',90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销
+                "companyNo" => $company['companyCode'],
+                "company_type" => 1,
+                "status" => 1,
+                "is_main" => $company['is_main'],
+                "is_del" => 0,
+                "addtime" => $date,
+                "updatetime" => $date,
+            ];
+        }
 
-        return app_show(0, '添加供应商账号成功');
+        if($insert_data) Db::name('user_role')->insertAll($insert_data);
+
+//        $up = Db::name("user_role")->insert([
+//            "uid" => $rs['data']["userid"],
+//            "nickname" => $rs['data']["nickname"],
+//            "roleid" => env('default_supplier_addcount_role_id',90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销
+//            "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"),
+//        ]);
+//        if ($up == false) return error_show(1004, '供应商账号分配角色失败');
+
+//        return app_show(0, '添加供应商账号成功');
+        return app_show($rs['code'], $rs['message'],$rs['data']);
     }