From fecb353a460c4c4f6f0ca8460bd22ccc7df6a116 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Tue, 16 Nov 2021 00:25:00 -0430 Subject: [PATCH] Add sorting org for login --- src/main/java/org/spin/base/util/SessionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spin/base/util/SessionManager.java b/src/main/java/org/spin/base/util/SessionManager.java index 572f1c0d0..c3aa0348d 100644 --- a/src/main/java/org/spin/base/util/SessionManager.java +++ b/src/main/java/org/spin/base/util/SessionManager.java @@ -187,7 +187,7 @@ public static int getDefaultOrganizationId(int roleId, int userId) { + "OR (r.IsUseUserOrgAccess='N' AND EXISTS(SELECT 1 FROM AD_Role_OrgAccess ra WHERE ra.AD_Org_ID = o.AD_Org_ID AND ra.AD_Role_ID = r.AD_Role_ID AND ra.IsActive='Y')) " + "OR (r.IsUseUserOrgAccess='Y' AND EXISTS(SELECT 1 FROM AD_User_OrgAccess ua WHERE ua.AD_Org_ID = o.AD_Org_ID AND ua.AD_User_ID = ? AND ua.IsActive='Y'))" + ") " - + "ORDER BY o.Name"; + + "ORDER BY o.AD_Org_ID DESC, o.Name"; return DB.getSQLValue(null, organizationSQL, roleId, userId); }