update

app/Models/Users.php

@@ -4,9 +4,11 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 
-class Users extends Model
+class Users extends Authenticatable
 {
+    protected $table = "t_users";
     const ROLE_SU = 1; // unused
     const ROLE_SUPERADMIN = 7;
     const ROLE_ADMIN = 2;
@@ -40,9 +42,12 @@ class Users extends Model
     const DEFAULT_PHONE_CODE = 62;
 
     const defaultSelected = "
-    u.*
-    ,c.c_name AS client_group_name,c.id AS client_group_id
-    ,r.name AS role_name
+        u.*
+        ,c.c_name AS client_group_name
+        ,c.id AS client_group_id
+        -- ,r.name as role_name
+        ,rl.id AS role_id
+        ,rl.name AS role_name
     ";
 
     public static function listUsers($filter = [])
@@ -77,19 +82,20 @@ class Users extends Model
         }
 
         return DB::select(
-            "SELECT
-        " .
+            " SELECT " .
                 Users::defaultSelected .
                 "
-        $select_select
-        FROM t_users AS u
-        LEFT JOIN t_clients AS c ON u.client_group_id = c.id
-        LEFT JOIN t_users_roles AS r ON u.role = r.id
-        $join_join
-        WHERE u.dlt is null
-        $where_where
-        $other_other
-        ;",
+                $select_select
+                FROM t_users AS u
+                LEFT JOIN t_clients AS c ON u.client_group_id = c.id
+                -- LEFT JOIN t_users_roles AS r ON u.role = r.id
+                LEFT JOIN model_has_roles AS mhr ON mhr.model_id = u.id
+                LEFT JOIN roles as rl ON rl.id = mhr.role_id
+                $join_join
+                WHERE u.dlt is null
+                $where_where
+                $other_other
+            ;",
             $params
         );
     }
@@ -137,7 +143,9 @@ class Users extends Model
                 "
         FROM t_users AS u
         LEFT JOIN t_clients AS c ON u.client_group_id = c.id
-        LEFT JOIN t_users_roles AS r ON u.role = r.id
+        -- LEFT JOIN t_users_roles AS r ON u.role = r.id
+        LEFT JOIN model_has_roles AS mhr ON mhr.model_id = u.id
+        LEFT JOIN roles as rl ON rl.id = mhr.role_id
         WHERE u.dlt is null
         AND u.id = ?
         LIMIT 1;",