From bfd7f590ab09814a1dc70fc5a7fc08d2ec5fe364 Mon Sep 17 00:00:00 2001
From: lisonge <i@songe.li>
Date: Wed, 22 Nov 2023 21:01:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20actionMaximum/actionCd=20=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=20(#306)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/li/songe/gkd/data/Rule.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/li/songe/gkd/data/Rule.kt b/app/src/main/java/li/songe/gkd/data/Rule.kt
index d27923ed90..edfbf91b96 100644
--- a/app/src/main/java/li/songe/gkd/data/Rule.kt
+++ b/app/src/main/java/li/songe/gkd/data/Rule.kt
@@ -70,7 +70,7 @@ data class Rule(
             ?: app.actionCd
         } else {
             null
-        }) ?: rule.actionCd ?: defaultMiniCd)
+        }) ?: rule.actionCd ?: group.actionCd ?: app.actionCd ?: defaultMiniCd)
     )
     var actionTriggerTime = Value(0L)
     fun trigger() {
@@ -89,7 +89,7 @@ data class Rule(
             ?: group.actionMaximum ?: app.actionMaximum
     } else {
         null
-    }) ?: rule.actionMaximum)
+    }) ?: rule.actionMaximum ?: group.actionMaximum ?: app.actionMaximum)
 
     var actionCount = Value(0)