Merge branch 'master' into cc_20250826_notice

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml

@@ -191,13 +191,19 @@
     </select>
     <select id="getAllUser" resultType="com.cool.store.dto.UserDTO">
         select
-        user_id as userId,
-        name,
-        mobile
-        from enterprise_user_${eid}
+        DISTINCT a.user_id as userId,
+        a.name,
+        a.mobile
+        from enterprise_user_${eid}  a left join enterprise_user_role_${eid} b  on a.`user_id` = b.`user_id`
         where active = true
         <if test="keyword!=null and keyword!=''">
-            and( name like concat('%',#{keyword},'%') or mobile like concat('%',#{keyword},'%'))
+            and( a.name like concat('%',#{keyword},'%') or a.mobile like concat('%',#{keyword},'%'))
+        </if>
+        <if test="roleIdList !=null and roleIdList.size>0">
+            and b.role_id in
+            <foreach item="roleId" index="index" collection="roleIdList" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
         </if>
     </select>