From 46d83847a2677d1ad15439c178580c2f44ba7eb0 Mon Sep 17 00:00:00 2001
From: "vluk@2fi-solutions.com.hk" <vluk@2fi-solutions.com.hk>
Date: Tue, 30 Sep 2025 21:46:15 +0800
Subject: [PATCH] no message

---
 .../ffii/lioner/modules/lioner/pdf/service/PdfService.java  | 2 +-
 .../modules/lioner/template/service/TemplateService.java    | 2 +-
 .../lioner/userActionLog/service/UserActionLogService.java  | 2 +-
 .../{03_userid_remove.sql => 03_userid_remove_userId.sql}   | 0
 .../changelog/changes/30_user_action_log/04_actionDesc.sql  | 6 ++++++
 5 files changed, 9 insertions(+), 3 deletions(-)
 rename src/main/resources/db/changelog/changes/30_user_action_log/{03_userid_remove.sql => 03_userid_remove_userId.sql} (100%)
 create mode 100644 src/main/resources/db/changelog/changes/30_user_action_log/04_actionDesc.sql

diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index f8672b4..6d02aa4 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -4313,7 +4313,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 			+ " ff.remarks, "
 			+ " f.filename, "
             + " c.clientCode, "
-            + " t.templateName, "
+            + " t.name as templateName, "
             + " t.remarks AS formCode, "
 			+ " fb.bytes AS blobValue "
 			+ " FROM filled_form ff "
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java b/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java
index 3e1aa40..b209bc4 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java
@@ -157,7 +157,7 @@ public class TemplateService extends AbstractBaseEntityService<Template, Long, T
 		StringBuilder sql = new StringBuilder("SELECT"
 			+ " t.id, "
 			+ " t.name, "
-			+ " t.templateName, "
+			+ " t.name as templateName, "
 			+ " t.remarks, "
 			+ " f.filename, "
 			+ " fb.bytes AS blobValue"
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/userActionLog/service/UserActionLogService.java b/src/main/java/com/ffii/lioner/modules/lioner/userActionLog/service/UserActionLogService.java
index 3728dbe..7627a1a 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/userActionLog/service/UserActionLogService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/userActionLog/service/UserActionLogService.java
@@ -62,7 +62,7 @@ public class UserActionLogService extends AbstractBaseEntityService<UserActionLo
 
 		if (args != null) {
 			if (args.containsKey("username")) sql.append(" AND user_action_log.username = :username");
-			if (args.containsKey("actionDesc")) sql.append(" AND user_action_log.actionDesc = :actionDesc");
+			if (args.containsKey("actionDesc")) sql.append(" AND user_action_log.actionDesc like :actionDesc");
 			if (args.containsKey("fromDate"))sql.append(" AND user_action_log.created >= :fromDate");
 			if (args.containsKey("toDate"))sql.append(" AND user_action_log.created < :toDate");
 		}
diff --git a/src/main/resources/db/changelog/changes/30_user_action_log/03_userid_remove.sql b/src/main/resources/db/changelog/changes/30_user_action_log/03_userid_remove_userId.sql
similarity index 100%
rename from src/main/resources/db/changelog/changes/30_user_action_log/03_userid_remove.sql
rename to src/main/resources/db/changelog/changes/30_user_action_log/03_userid_remove_userId.sql
diff --git a/src/main/resources/db/changelog/changes/30_user_action_log/04_actionDesc.sql b/src/main/resources/db/changelog/changes/30_user_action_log/04_actionDesc.sql
new file mode 100644
index 0000000..6e13e94
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/30_user_action_log/04_actionDesc.sql
@@ -0,0 +1,6 @@
+--liquibase formatted sql
+
+--changeset vin:drop and create again
+
+ALTER TABLE `lionerdb`.`user_action_log` 
+CHANGE COLUMN `actionDesc` `actionDesc` VARCHAR(500) NULL DEFAULT NULL ;
\ No newline at end of file