diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java index 3bb04f145..d7b2fa755 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java @@ -60,14 +60,14 @@ public class WxCUserFromServiceImpl implements WxCUserFromService, IExcelExportS @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxCUserFrom record) { String sheetName = "门店(用户)分享明细"; - if(record.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode())){ + if(record.getFromType() != null && record.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode())){ WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getFromId(), record.getFinalTenantId()); if(wxCUserBasicInfo != null){ sheetName = "用户["+wxCUserBasicInfo.getPhone()+"]分享明细"; }else{ sheetName = "用户分享明细"; } - }else if(record.getFromType().equals(EnumCUserFrom.FROM_MERCHANT.getCode())){ + }else if(record.getFromType() != null && record.getFromType().equals(EnumCUserFrom.FROM_MERCHANT.getCode())){ WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getFromId()); if(wxMerchant != null){ sheetName = "门店["+wxMerchant.getName()+"]分享明细"; @@ -84,9 +84,9 @@ public class WxCUserFromServiceImpl implements WxCUserFromService, IExcelExportS @Override public void exportDataVisits(HttpServletRequest request, HttpServletResponse response, WxCUserFromVo record) { String sheetName = "门店(用户)分享报表"; - if(record.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode())){ + if(record.getFromType() != null && record.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode())){ sheetName = "用户分享报表"; - }else if(record.getFromType().equals(EnumCUserFrom.FROM_MERCHANT.getCode())){ + }else if(record.getFromType() != null && record.getFromType().equals(EnumCUserFrom.FROM_MERCHANT.getCode())){ sheetName = "门店分享报表"; } String fileName = sheetName + ".xlsx";