From fc339b23fabd67758681ad8884331a35a82f1a8a Mon Sep 17 00:00:00 2001
From: "YAS\\29473" <2947326429@qq.com>
Date: Sat, 27 Dec 2025 16:09:47 +0800
Subject: [PATCH] =?UTF-8?q?update=E6=9F=A5=E8=AF=A2=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E7=BB=84=E4=B8=AD=E4=BC=9A=E5=91=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/mapper/MemberGroupMapper.java |  2 +-
 .../pile/service/impl/MemberGroupServiceImpl.java  |  5 ++++-
 .../resources/mapper/pile/MemberGroupMapper.xml    | 14 ++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
index dd64d6c13..7d7475fd2 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java
@@ -80,7 +80,7 @@ public interface MemberGroupMapper {
 
     MemberGroupVO queryByGroupCodeAndMemberId(@Param("groupCode") String groupCode, @Param("memberId") String memberId);
 
-    List<MemberVO> queryMemberList(@Param("groupCode") String groupCode);
+    List<MemberVO> queryMemberList(MemberGroupDTO dto);
 
     MemberGroup selectByGroupCode(String groupCode);
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
index e0a50aafc..7e18ed938 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
@@ -386,7 +386,10 @@ public class MemberGroupServiceImpl implements MemberGroupService {
 
     @Override
     public List<MemberVO> queryMemberList(MemberGroupDTO dto) {
-        List<MemberVO> list = memberGroupMapper.queryMemberList(dto.getGroupCode());
+        if (dto.getGroupCode().isEmpty()){
+            return null;
+        }
+        List<MemberVO> list = memberGroupMapper.queryMemberList(dto);
         return list;
     }
 
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml
index cccf2984e..982fae8ed 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml
@@ -19,7 +19,7 @@
         <result property="updateTime"    column="update_time"    />
         <result property="delFlag"    column="del_flag"    />
     </resultMap>
-    
+
     <sql id="Base_Column_List">
         id, group_name, group_code, merchant_id, station_id, group_level, group_type, discount, create_by, create_time, update_by, update_time, del_flag
     </sql>
@@ -165,8 +165,14 @@
         FROM
         member_basic_info t1
         JOIN member_group_relation t2 ON t2.member_id = t1.member_id and t2.del_flag = '0'
-        where
-            t2.group_code = #{groupCode,jdbcType=VARCHAR}
+        WHERE t1.del_flag = '0'
+            AND t2.group_code = #{groupCode}
+        <if test="phoneNumber != null and phoneNumber != ''">
+            AND t1.mobile_number LIKE CONCAT('%', #{phoneNumber}, '%')
+        </if>
+        <if test="memberId != null and memberId != ''">
+            AND t2.member_id = #{memberId}
+        </if>
     </select>
 
     <select id="selectByGroupCode" resultMap="MemberGroupResult">
@@ -247,4 +253,4 @@
         WHERE
             FIND_IN_SET(t1.id, (SELECT station_id FROM member_group WHERE group_code = #{groupCode,jdbcType=VARCHAR}))
     </select>
-</mapper>
\ No newline at end of file
+</mapper>