From 1f52352c8145e6ee14a3fb2c7ef74b5631f12cd7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 15 Jan 2021 15:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCUserFromServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 dd796ddbf..3bb04f145 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromServiceImpl.java @@ -59,16 +59,20 @@ public class WxCUserFromServiceImpl implements WxCUserFromService, IExcelExportS @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxCUserFrom record) { - String sheetName = "门店/用户分享明细"; + String sheetName = "门店(用户)分享明细"; if(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())){ WxMerchant wxMerchant = wxMerchantMapper.selectById(record.getFromId()); if(wxMerchant != null){ sheetName = "门店["+wxMerchant.getName()+"]分享明细"; + }else{ + sheetName = "门店分享明细"; } } String fileName = sheetName + ".xlsx"; @@ -79,7 +83,7 @@ public class WxCUserFromServiceImpl implements WxCUserFromService, IExcelExportS @Override public void exportDataVisits(HttpServletRequest request, HttpServletResponse response, WxCUserFromVo record) { - String sheetName = "门店/用户分享报表"; + String sheetName = "门店(用户)分享报表"; if(record.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode())){ sheetName = "用户分享报表"; }else if(record.getFromType().equals(EnumCUserFrom.FROM_MERCHANT.getCode())){