Merge branch 'master-new-dev-wf' of wugg/phpstock into master-new

app/admin/controller/Action.php

@@ -209,8 +209,11 @@ class Action extends BaseController
             $result[$val['id']] = $val;
         }
 
+        $child_where = [["pid", "<>", 0], ['status', "=", 1], ["is_del", "=", 0]];
+        if (isset($post['level']) && $post['level'] !== '') $child_where[] = ['level', 'in', $post['level']];
+
         $child = Db::name("admin_menu")
-            ->where([["pid", "<>", 0], ['status', "=", 1], ["is_del", "=", 0]])
+            ->where($child_where)
             ->select()
             ->toArray();
         foreach ($child as $k => $value) {

app/admin/controller/User.php

@@ -366,7 +366,7 @@ class User extends Base
     //账户角色列表
     public function userRoleList()
     {
-        $post = $this->request->only(["token" => "", "nickname" => "", "relaComNo" => "", "islevel" => "", "username" => "", "companyNo" => "", "status" => "", "page" => 1, "size" => 10], "post");
+        $post = $this->request->only(["token" => "", "nickname" => "", "relaComNo" => "", "level" => "", "username" => "", "companyNo" => "", "status" => "", "page" => 1, "size" => 10], "post");
         if ($this->level == 1) {
             $companyNo = $post['companyNo'] ?? "";
         } else {