From f485a440d0103a70c2418d18600b2e52fb0db152 Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Thu, 23 Dec 2021 18:07:32 +0800
Subject: [PATCH] nullpointer fix

---
 .../payment/manage/merchants/core/impls/ClientManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index b810e8d57..2dcb969b5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -6164,7 +6164,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject result = null;
         JSONObject expireInfo = clientContractService.getClientContractExpire(client_id, channel);
         JSONObject account = clientAccountMapper.findById(account_id);
-        if (PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
+        if (account == null || PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER) {
             return result;
         } else {
             if (expireInfo.getBooleanValue("alert")) {