| @@ -60,14 +60,14 @@ public class WxCUserFromServiceImpl implements WxCUserFromService, IExcelExportS | |||||
| @Override | @Override | ||||
| public void exportData(HttpServletRequest request, HttpServletResponse response, WxCUserFrom record) { | public void exportData(HttpServletRequest request, HttpServletResponse response, WxCUserFrom record) { | ||||
| String sheetName = "门店(用户)分享明细"; | 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()); | WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(record.getFromId(), record.getFinalTenantId()); | ||||
| if(wxCUserBasicInfo != null){ | if(wxCUserBasicInfo != null){ | ||||
| sheetName = "用户["+wxCUserBasicInfo.getPhone()+"]分享明细"; | sheetName = "用户["+wxCUserBasicInfo.getPhone()+"]分享明细"; | ||||
| }else{ | }else{ | ||||
| sheetName = "用户分享明细"; | 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()); | WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getFromId()); | ||||
| if(wxMerchant != null){ | if(wxMerchant != null){ | ||||
| sheetName = "门店["+wxMerchant.getName()+"]分享明细"; | sheetName = "门店["+wxMerchant.getName()+"]分享明细"; | ||||
| @@ -84,9 +84,9 @@ public class WxCUserFromServiceImpl implements WxCUserFromService, IExcelExportS | |||||
| @Override | @Override | ||||
| public void exportDataVisits(HttpServletRequest request, HttpServletResponse response, WxCUserFromVo record) { | public void exportDataVisits(HttpServletRequest request, HttpServletResponse response, WxCUserFromVo record) { | ||||
| String sheetName = "门店(用户)分享报表"; | 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 = "用户分享报表"; | sheetName = "用户分享报表"; | ||||
| }else if(record.getFromType().equals(EnumCUserFrom.FROM_MERCHANT.getCode())){ | |||||
| }else if(record.getFromType() != null && record.getFromType().equals(EnumCUserFrom.FROM_MERCHANT.getCode())){ | |||||
| sheetName = "门店分享报表"; | sheetName = "门店分享报表"; | ||||
| } | } | ||||
| String fileName = sheetName + ".xlsx"; | String fileName = sheetName + ".xlsx"; | ||||