账户角色列表优化

app/admin/controller/User.php

@@ -327,26 +327,29 @@ class User extends Base
             $where[] = ["a.companyNo", "=", $companyNo];
         }
         if ($post['status'] !== '') {
-            $uid = Db::name("user_role")->alias("a")->where(["status" => 1, "is_del" => 0])->where($where)->column("uid");
+            $uid = Db::name("user_role")
+                ->alias("a")
+                ->where(["status" => 1, "is_del" => 0])
+                ->where($where)
+                ->column("uid");
             if ($post['status'] == 1) {
                 $where[] = ["a.status", "=", 1];
                 $post['uid'] = $uid;
-            } else {
-                $post['nuid'] = $uid;
-            }
+            } else $post['nuid'] = $uid;
             unset($post['status']);
         }
-        if ($post["islevel"] != "") {
-            $uid = Db::name("user_role")->alias("a")
-                ->leftJoin("role b", "a.roleid=b.id")->where([["b.level", "=", 1], ["a.is_del", "=", 0]])->where($where)->column
-                ("uid");
-            if ($post['islevel'] == 1) {
-                $post['uid'] = $uid;
-            } else {
-                $post['nuid'] = $uid;
-            }
-            unset($post["islevel"]);
-        }
+//        if ($post["islevel"] != "") {
+//            $uid = Db::name("user_role")
+//                ->alias("a")
+//                ->leftJoin("role b", "a.roleid=b.id")
+//                ->where([["b.level", "=", 1], ["a.is_del", "=", 0]])
+//                ->where($where)
+//                ->column("uid");
+//            if ($post['islevel'] == 1) $post['uid'] = $uid;
+//             else $post['nuid'] = $uid;
+//
+//            unset($post["islevel"]);
+//        }
 //    	var_dump($post);
 //        $userinfo=GetUserList($post);
         $userCommon = new CommonUser();
@@ -358,14 +361,16 @@ class User extends Base
         $data = $userinfo['data']['list'];
         $list = [];
         foreach ($data as $value) {
-            $roleArr = Db::name("user_role")->alias("a")
+            $roleArr = Db::name("user_role")
+                ->alias("a")
                 ->leftJoin("role b", "a.roleid=b.id")
                 ->where(["uid" => $value['id'], "a.companyNo" => $value['companyCode'], "is_del" => 0])
-                ->field("role_name,roleid,a.status,b.level")->findOrEmpty();
+                ->field("role_name,roleid,a.status")
+                ->findOrEmpty();
             $value['roleid'] = $roleArr['roleid'] ?? "";
             $value['status'] = $value['status'] == 1 ? ($roleArr['status'] ?? 0) : 0;
             $value["role_name"] = $roleArr['role_name'] ?? "";
-            $value["role_level"] = $roleArr['level'] ?? "";
+            $value["role_level"] = $value['level'] ?? "";
             $list[] = $value;
         }
         return app_show(0, "获取成功", ["list" => $list, "count" => $userinfo['data']["count"]]);