From 822de44fb84678ec4097e1ecb34adf944dffd1c2 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 17 Sep 2025 16:17:55 +0800
Subject: [PATCH] feat(mall): 根据当前用户公司 ID 筛选会员列表

---
 src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java |   16 ++++++++++++++++
 src/main/resources/mapper/modules/MallMemberMapper.xml                             |    3 +++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
index d6d33f8..0a71bf1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
@@ -60,10 +60,26 @@
      */
     @GetMapping("getMallMemberList")
     public FebsResponse getMallMemberList(MallMember mallMember, QueryRequest request) {
+
+        String companyId = getCurrentUserCompanyId();
+        mallMember.setCompanyId(companyId);
         Map<String, Object> data = getDataTable(mallMemberService.getMallMemberList(mallMember, request));
         return new FebsResponse().success().data(data);
     }
 
+//    /**
+//     * 会员列表
+//     *
+//     * @param mallMember
+//     * @param request
+//     * @return
+//     */
+//    @GetMapping("getMallMemberList")
+//    public FebsResponse getMallMemberList(MallMember mallMember, QueryRequest request) {
+//        Map<String, Object> data = getDataTable(mallMemberService.getMallMemberList(mallMember, request));
+//        return new FebsResponse().success().data(data);
+//    }
+
     /**
      * 会员列表---禁止
      *
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 067fd07..500c516 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -62,6 +62,9 @@
                 <if test="record.birthdayQuery!=null">
                     and date_format(a.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
                 </if>
+                <if test="record.companyId!=null and record.companyId!=''">
+                    and a.company_Id = #{record.companyId}
+                </if>
                 <if test="record.name!=null and record.name!=''">
                     and a.name like concat('%',  #{record.name},'%')
                 </if>

--
Gitblit v1.9.1