From a8afc43437c2b0de9e0aa9e63b6959c3c54d4419 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Feb 2020 15:12:03 +0800
Subject: [PATCH] fix getAppActPopup

---
 pom.xml                                                        | 2 +-
 .../com/royalpay/payment/manage/mappers/act/ActAppMapper.xml   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index c96ce8545..b6d943ab6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.45</version>
+    <version>1.3.46</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml
index 2a8bc1e08..1e35cf676 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.xml
@@ -16,7 +16,8 @@
         select *
         from act_app_list
         where  is_valid = 1
-        and expire_date  &gt; #{now}
+        and active_date &lt;=NOW()
+        and expire_date  &gt; NOW()
         order by create_time desc
         limit 1
     </select>