From 240d88b5accfd606e9009cd0aacb6a3db52cf77f Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 20 Feb 2020 09:23:51 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=95=86=E6=9C=8D=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=8F=AA=E9=92=88=E5=AF=B9pine=E5=BC=80=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2ff184c36..8c8d440ef 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.48 + 1.3.49 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 510248322..eac79d1fe 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -1579,7 +1579,7 @@ public class RetailAppServiceImp implements RetailAppService { result.add(confirmNotice); JSONObject latestAct = appActService.getAppActPopup(); - if (latestAct != null) { + if (latestAct != null && clientId == 9) { latestAct.put("id", latestAct.getString("act_id")); latestAct.put("url", latestAct.getString("act_url")); latestAct.put("title", latestAct.getString("act_name"));