From 0640e29b1355878e82265c12115ef14fe18865cd Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 12 Oct 2018 10:45:32 +0200 Subject: [PATCH] IDEMPIERE-3802 Bug in ResetLockedAccount when using USER_LOCKING_MAX_INACTIVE_PERIOD_DAY --- .../src/org/adempiere/process/ResetLockedAccount.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java index a50fd3aa0f..2880e88e75 100644 --- a/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java +++ b/org.adempiere.base/src/org/adempiere/process/ResetLockedAccount.java @@ -69,16 +69,16 @@ public class ResetLockedAccount extends SvrProcess { if (DB.isPostgreSQL()) { if (MAX_ACCOUNT_LOCK_MINUTES > 0) - sql.append( " AND EXTRACT(MINUTE FROM (now()-DateAccountLocked)) * 24 * 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES); + sql.append(" AND EXTRACT(EPOCH FROM (now()-DateAccountLocked)) / 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES); if (MAX_INACTIVE_PERIOD > 0) - sql.append(" AND EXTRACT(DAY FROM (now()-DateLastLogin)) * 24 <= ").append(MAX_INACTIVE_PERIOD); + sql.append(" AND EXTRACT(EPOCH FROM (now()-DateLastLogin)) / 86400 <= ").append(MAX_INACTIVE_PERIOD); } else { if (MAX_ACCOUNT_LOCK_MINUTES > 0) - sql.append(" AND (SysDate-DateAccountLocked) * 24 * 60 > ").append(MAX_ACCOUNT_LOCK_MINUTES); + sql.append(" AND (SysDate-DateAccountLocked) * 1440 > ").append(MAX_ACCOUNT_LOCK_MINUTES); if (MAX_INACTIVE_PERIOD > 0) - sql.append(" AND (SysDate-DateLastLogin) * 24 <= ").append(MAX_INACTIVE_PERIOD); + sql.append(" AND (SysDate-DateLastLogin) <= ").append(MAX_INACTIVE_PERIOD); } int no = DB.executeUpdate(sql.toString(), p_AD_Client_ID, get_TrxName());