diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index a08a72f38..e2b38ee4c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -224,10 +224,21 @@ public class WxCUserBasicInfoController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", page); } - @RequestMapping("/exportData") + @ApiOperation("会员记录导出") + @GetMapping("/exportData") public void exportData(@ModelAttribute WxCUserBasicInfo basicInfo, HttpServletRequest request, HttpServletResponse response) { logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportData"); - if(basicInfo == null) basicInfo = new WxCUserBasicInfo(); + if(basicInfo == null) { + basicInfo = new WxCUserBasicInfo(); + } else { + if (StringUtils.isBlank(basicInfo.getPhone())) { + basicInfo.setPhone(null); + } + if (StringUtils.isBlank(basicInfo.getName())) { + basicInfo.setName(null); + } + } + basicInfo.setTenantId(getTenantId()); wxCUserBasicInfoService.exportData(basicInfo, request, response); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 802959840..a4a4c18ad 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -253,7 +253,7 @@ public enum ErrorCode{ /** * 会员 */ - MEM_IMPORT_ERR(13000, "模板导入失败,请尝试重新导入"), + MEM_IMPORT_ERR(13000, "模板导入失败,请检查数据,尝试重新导入"), MEM_SCORE_NOT_ENOUGH(13001, "成长值不够扣减值"), /**