From c0efa62475e0970e971102f118e27a0e3138cf0b Mon Sep 17 00:00:00 2001
From: LO Kam Tao Leo <leolo@leolo.org>
Date: Wed, 2 Feb 2022 08:46:38 +0000
Subject: [PATCH] Fix the issue that login fails during first login

---
 src/org/leolo/web/dm/dao/UserDao.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/org/leolo/web/dm/dao/UserDao.java b/src/org/leolo/web/dm/dao/UserDao.java
index 66389d2..98316fb 100644
--- a/src/org/leolo/web/dm/dao/UserDao.java
+++ b/src/org/leolo/web/dm/dao/UserDao.java
@@ -29,7 +29,9 @@ public class UserDao extends BaseDao {
 						u.put(Constant.BUI_KEY_USER_ID, rs.getInt(1));
 						u.put(Constant.BUI_KEY_PASSWORD, rs.getString(3));
 						u.put(Constant.BUI_KEY_FAIL_CNT, rs.getInt(4));
-						u.put(Constant.BUI_KEY_LAST_LOGIN, rs.getTimestamp(5));
+						if(rs.getTimestamp(5)!=null) {
+							u.put(Constant.BUI_KEY_LAST_LOGIN, rs.getTimestamp(5));
+						}
 					} else {
 						return null;
 					}