peng
2025-10-23 df770e2fcc22ba7cd0a89ababdd381e862ffe3ab
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -644,6 +644,8 @@
        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getNickName()), "nick_name", memberSearchVO.getNickName());
        //按照电话号码查询
        queryWrapper.like(CharSequenceUtil.isNotBlank(memberSearchVO.getMobile()), "mobile", memberSearchVO.getMobile());
        //按照会员id查询
        queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getMemberId()), "m.id", memberSearchVO.getMemberId());
        //按照会员状态查询
        queryWrapper.eq(CharSequenceUtil.isNotBlank(memberSearchVO.getDisabled()), "disabled",
                memberSearchVO.getDisabled().equals(SwitchEnum.OPEN.name()) ? 1 : 0);
@@ -653,11 +655,9 @@
            String tagIdsStr = memberSearchVO.getTagIds().stream()
                    .map(String::valueOf)
                    .collect(Collectors.joining(","));
            queryWrapper.inSql("id",
            queryWrapper.inSql("m.id",
                    "SELECT DISTINCT member_id FROM lmk_member_tag WHERE tag_id IN (" +
                            tagIdsStr + ")");
            return this.baseMapper.pageByMemberVOAndBindStore(PageUtil.initPage(page), queryWrapper);
        }
        return this.baseMapper.pageByMemberVOAndBindStore(PageUtil.initPage(page),queryWrapper);
    }
@@ -736,6 +736,7 @@
        // 创建表头
        Row header = sheet.createRow(0);
        String[] headers = {
                "会员id",
                "会员名称", "会员昵称","联系方式",
                "注册时间","最后登录时间"
        };
@@ -746,11 +747,12 @@
        for (int i=0;i< exportDetailDTOS.size();i++){
            MemberExportVO dto = exportDetailDTOS.get(i);
            Row row = sheet.createRow(i+1);
            row.createCell(0).setCellValue(dto.getUsername());
            row.createCell(1).setCellValue(dto.getNickName());
            row.createCell(2).setCellValue(dto.getMobile());
            row.createCell(3).setCellValue(dto.getCreateTime());
            row.createCell(4).setCellValue(dto.getLastLoginDate());
            row.createCell(0).setCellValue(dto.getId());
            row.createCell(1).setCellValue(dto.getUsername());
            row.createCell(2).setCellValue(dto.getNickName());
            row.createCell(3).setCellValue(dto.getMobile());
            row.createCell(4).setCellValue(dto.getCreateTime());
            row.createCell(5).setCellValue(dto.getLastLoginDate());
        }
        return workbook;