diff --git a/lib/bpm/sign_todo_api.dart b/lib/bpm/sign_todo_api.dart
index cdbf2b2..084bdc1 100644
--- a/lib/bpm/sign_todo_api.dart
+++ b/lib/bpm/sign_todo_api.dart
@@ -27,11 +27,18 @@ class SignTodoApiService {
   }) async {
     // 準備傳送給 SP 的參數 Map (不含 token，fetchProcedure 會補齊)
     final Map<String, String> params = {
+      /* 配合 server 程式, 參數一律用 para0x  以方便排序 20260302 Michael
       "sign_type": type,
       "uuid": uuid,
       "source_pk_value": billNo,
       "sign_note": note,
       "next_signer": nextSigner.isEmpty ? "*" : nextSigner, // 根據 SP 註解，空值傳 *
+      */
+      "para01": type,
+      "para02": uuid,
+      "para03": billNo,
+      "para04": note,
+      "para05": nextSigner.isEmpty ? "*" : nextSigner, // 根據 SP 註解，空值傳 *
     };
 
     try {
diff --git a/lib/leave/leave_api.dart b/lib/leave/leave_api.dart
index 0e023ae..194d56e 100644
--- a/lib/leave/leave_api.dart
+++ b/lib/leave/leave_api.dart
@@ -42,7 +42,7 @@ class LeaveApiService {
   // 獲取個人請假紀錄
   Future<List<Leave>> fetchLeaves(String personId) async {
     // 排序：按單據日期降冪
-    String queryFilter = "1^100^billdate^*^^^personid^$personId";
+    String queryFilter = "1^100^billdate^*^start_date BETWEEN DATE_SUB(CURDATE(), INTERVAL 7 DAY) AND DATE_ADD(CURDATE(), INTERVAL 7 DAY)^^personid^$personId";
 
     return await _apiService.fetchList<Leave>(
       tableName: "hrs_leave",
diff --git a/lib/message/message_api.dart b/lib/message/message_api.dart
index 5ea4720..9d5eb11 100644
--- a/lib/message/message_api.dart
+++ b/lib/message/message_api.dart
@@ -15,7 +15,7 @@ class MessageApiService {
     // 排序：按通知日期 (create_date) 降冪排列
     // 實務上可根據您的 Generic API 支援度，將 dateParam 傳入作為過濾條件
     // String queryFilter = "1^100^create_date^*^^^receivers^$userId^after^$dateParam";
-    String queryFilter = "1^100^create_date^*^^^receivers^$userId^^";
+    String queryFilter = "1^100^create_date^*^create_date >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)^^receivers^$userId^^";
 
     return await _apiService.fetchList<EipMessage>(
       tableName: "eip_message", // 指向訊息資料表