From 644ca660804587b8a3353f7085eb9aff5efef5df Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Thu, 2 Jun 2022 14:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/card/service/impl/XhpcCardServiceImpl.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
index fc040d27..03a3eaa0 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
@@ -579,8 +579,12 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
             }else{
                 operator = xhpcOperatorMapper.selectOneByCorpNoAndTenantId(cardInfo.getCorpIndex(), tokenService.getLoginUser().getSysUser().getTenantId());
             }
-            dataDTO.setGrantOperatorName(operator.getName());
-            dataDTO.setCardSerialNumber(tIccardLog.getUniqueid());
+            if(operator !=null && operator.getName() !=null){
+                dataDTO.setGrantOperatorName(operator.getName());
+            }
+            if(tIccardLog.getUniqueid() !=null){
+                dataDTO.setCardSerialNumber(tIccardLog.getUniqueid());
+            }
             dataDTO.setOperate(Integer.valueOf(tIccardLog.getOperate()));
             if(cardInfo.getCashPledge() !=null){
                 dataDTO.setCashPledge(Long.valueOf(cardInfo.getCashPledge()));