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()));