diff --git a/backstage/application/backstage/controllers/Admin.php b/backstage/application/backstage/controllers/Admin.php
index a7a4b48..8cc3398 100644
--- a/backstage/application/backstage/controllers/Admin.php
+++ b/backstage/application/backstage/controllers/Admin.php
@@ -142,9 +142,23 @@ class Admin extends CI_Controller{
 			$where.= " and a.company_id = ".$company_id;
 		}
 		
-        $sql = "select a.*,b.`name` as hall_name,c.company_name,d.name role_name from tb_admin a LEFT JOIN tb_dining_hall b on a.dining_hall_id = b.id ,tb_company c,tb_role d
-			where a.company_id = c.id and a.role_id = d.id and a.enabled = 1 ".$where;
-		//echo $sql;exit;
+//        $sql = "select a.*,b.`name` as hall_name,c.company_name,d.name role_name from tb_admin a LEFT JOIN tb_dining_hall b on a.dining_hall_id = b.id ,tb_company c,tb_role d
+//			where a.company_id = c.id and a.role_id = d.id and a.enabled = 1 ".$where;
+        $sql = "
+        SELECT
+          a.*,
+          b.`name` AS hall_name,
+          c.company_name,
+          d.name AS role_name
+        FROM
+          tb_admin a
+          LEFT JOIN tb_dining_hall b ON a.dining_hall_id = b.id
+          LEFT JOIN tb_company c ON b.company_id = c.id
+          LEFT JOIN tb_role d ON a.role_id = d.id
+        WHERE
+          a.enabled = 1
+        ".$where;
+//		echo $sql;exit;
         $order = "a.id desc";
         $action = "getListByPage";
 		$group = null;