diff --git a/app/Controllers/API_Users.php b/app/Controllers/API_Users.php
index a25e20b..ad6b367 100644
--- a/app/Controllers/API_Users.php
+++ b/app/Controllers/API_Users.php
@@ -8,10 +8,19 @@ class API_Users extends ResourceController {
public function index() {
$db = \Config\Database::connect();
- $sql = "select u.USERID, u.USERNAME, u1.USERROLEID, ur.USERROLENAME from cmod.dbo.CM_USERS u1
- full join USERS u on u.USERID=u1.USERID
- left join cmod.dbo.CM_USERROLES ur on ur.USERROLEID=u1.USERROLEID
- where ( u.LOCKEDACCOUNT is null or u.LOCKEDACCOUNT=0 )";
+
+ $usercityid = session()->get('usercityid');
+ if($usercityid==1){$filterquery=" AND uc.CITYID = 1";}
+ else if($usercityid==2){$filterquery=" AND uc.CITYID = 2";}
+ else{$filterquery=" ";}
+
+ $sql = "select u.USERID, u.USERNAME, uc.CITYNAME ,u1.USERROLEID, ur.USERROLENAME
+ from cmod.dbo.CM_USERS u1
+ full join USERS u on u.USERID=u1.USERID
+ left join cmod.dbo.CM_USERS us on us.USERID=u.USERID
+ left join cmod.dbo.CM_USERSCITY uc on uc.CITYID=us.CITYID
+ left join cmod.dbo.CM_USERROLES ur on ur.USERROLEID=u1.USERROLEID
+ where ( u.LOCKEDACCOUNT is null or u.LOCKEDACCOUNT=0 ) $filterquery";
$query = $db->query($sql);
$results = $query->getResultArray();
diff --git a/app/Controllers/Auth.php b/app/Controllers/Auth.php
index be9b016..e6242ce 100644
--- a/app/Controllers/Auth.php
+++ b/app/Controllers/Auth.php
@@ -19,14 +19,15 @@ class Auth extends BaseController {
$db = \Config\Database::connect();
$sql = "SELECT u.USERID, u.USERNAME, u1.PASSWORD, u1.CITYID, ur.USERROLENAME
-FROM USERS u
- left join cmod.dbo.CM_USERS u1 on u.USERID=u1.USERID
- left join cmod.dbo.CM_USERROLES ur on u1.USERROLEID=ur.USERROLEID
-WHERE u.USERID='$userid'";
+ FROM USERS u
+ left join cmod.dbo.CM_USERS u1 on u.USERID=u1.USERID
+ left join cmod.dbo.CM_USERROLES ur on u1.USERROLEID=ur.USERROLEID
+ WHERE u.USERID='$userid'";
$query = $db->query($sql);
$result = $query->getResultArray();
- $row = $result[0];
- if(isset($row)) {
+
+ if(isset($result[0])) {
+ $row = $result[0];
$qpassword = $row['PASSWORD'];
$userid = $row['USERID'];
$username = $row['USERNAME'];
diff --git a/app/Views/admin/users_index.php b/app/Views/admin/users_index.php
index 560c636..f270802 100644
--- a/app/Views/admin/users_index.php
+++ b/app/Views/admin/users_index.php
@@ -13,6 +13,7 @@
| Userid |
Name |
Role |
+ Site |
Action |
@@ -93,6 +94,7 @@ function index() {
for (var i = 0; i < data.length; i++) {
let userid = data[i].USERID;
let username = data[i].USERNAME;
+ let site = data[i].CITYNAME == null ? "-": data[i].CITYNAME;
let userroleid = data[i].USERROLEID;
if(userroleid === null) {userroleid = '';}
let userrolename = '';
@@ -100,7 +102,7 @@ function index() {
let editBtn = ' ';
editBtn += ' ';
let datarow = '' +
- '| ' + userid + ' | ' + '' + username + ' | ' + '' + userrolename + ' | ' + '' + editBtn + ' | ' +
+ '' + userid + ' | ' + '' + username + ' | ' + '' + userrolename + ' | ' + '' + site + ' | ' + '' + editBtn + ' | ' +
'
';
$("#table-body").append(datarow);
}
diff --git a/app/Views/auth_login.php b/app/Views/auth_login.php
index 7fc2cef..dca104a 100644
--- a/app/Views/auth_login.php
+++ b/app/Views/auth_login.php
@@ -19,6 +19,7 @@
+