添加账户修改，menuactionlist接口增加入参

app/admin/controller/Action.php

@@ -9,25 +9,35 @@ class Action extends BaseController{
     public function __construct(App $app) {parent::__construct($app);}
 
     //获取素有菜单列表数据
- public function index(){
-    	$post=$this->request->post();
+    public function index()
+    {
+        $post = $this->request->post();
 
-		$where=[["status","=",1],["is_del","=",0],["level",">=",$post["level"]??1],['menu_type',"=",2]];
-        $data = Db::name("admin_menu")->where($where)->order("weight desc")->column("id,menu_name,menu_img,menu_route,menu_url,pid,level,is_show,is_private,menu_type,status");
+        $where = [["status", "=", 1], ["is_del", "=", 0], ['menu_type', "=", 2]];
+
+        if (isset($post['level']) && $post['level'] !== '') $where[] = ['level', 'in', $post['level']];
+
+        $data = Db::name("admin_menu")
+            ->where($where)
+            ->order("weight desc")
+            ->column("id,menu_name,menu_img,menu_route,menu_url,pid,level,is_show,is_private,menu_type,status");
         $result = [];
-        if(empty($data)){
-            return app_show(0,"获取成功",$result);
+        if (empty($data)) {
+            return app_show(0, "获取成功", $result);
         }
-        $list=[];
-        $menu=[];
-        foreach ($data as $k=>$value){
-            $action = Db::name("action")->alias("a")->leftJoin("action_list b","a.action_code=b.action_code")->where
-            (["menuid"=>$value['id'],"a.status"=>1,"a.is_del"=>0,"b.is_del"=>0])->column("a.id,a.action_code,b.action_name");
-            if($value['menu_type']==2) $value['action']=$action;
-            $list[]=$value;
+        $list = [];
+        $menu = [];
+        foreach ($data as $k => $value) {
+            $action = Db::name("action")
+                ->alias("a")
+                ->leftJoin("action_list b", "a.action_code=b.action_code")
+                ->where(["menuid" => $value['id'], "a.status" => 1, "a.is_del" => 0, "b.is_del" => 0])
+                ->column("a.id,a.action_code,b.action_name");
+            if ($value['menu_type'] == 2) $value['action'] = $action;
+            $list[] = $value;
         }
-        menuAction($list,$menu);
-        return app_show(0,"获取成功",array_values($menu));
+        menuAction($list, $menu);
+        return app_show(0, "获取成功", array_values($menu));
     }
 
     public function ActionList(){

app/admin/controller/User.php

@@ -592,52 +592,26 @@ class User extends BaseController{
                 return error_show(1004, $nam['message']);
             }
 
-            $userrole = [];
-            foreach ($post['companyArr'] as $company) {
-                switch ($post['level']) {
-                    case 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[] = [
-                            "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;
-                }
-            }
+            $userrole = [
+                "uid" => $nam['data']["userid"],
+                "nickname" => $nam['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 (!empty($userrole)) {
 //                $userrole['uid'] = $nam['data']["userid"];
 //                $userrole['nickname'] = $nam['data']["nickname"];
 
-
-            if ($userrole) {
-                $up = Db::name("user_role")->insertAll($userrole);
-                if ($up == false) {
-                    return error_show(1004, '账户角色分配失败');
-                }
-            }
-
 //            }
+            $up = Db::name("user_role")->insert($userrole);
+            if ($up == false) return error_show(1004, '账户角色分配失败');
         }
 
         return $post['id'] == "" ? app_show(0, "账户新建成功") : app_show(0, "账户编辑成功");