From a11e150630fb109679ce9242cb715d9886848dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Wed, 3 Sep 2025 17:15:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=9D=A3=E5=AF=BC=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cool/store/dao/EnterpriseUserDAO.java    |  4 ++--
 .../cool/store/mapper/EnterpriseUserMapper.java  |  2 +-
 .../resources/mapper/EnterpriseUserMapper.xml    | 16 +++++++++++-----
 .../service/impl/UserAuthMappingServiceImpl.java |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
index 90f9909a6..6a25575c2 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
@@ -158,8 +158,8 @@ public class EnterpriseUserDAO {
         return enterpriseUserMapper.getUserListByRegionId(regionId);
     }
 
-    public List<UserDTO> getAllUser(String eid, String keyword) {
-        return enterpriseUserMapper.getAllUser(eid, keyword);
+    public List<UserDTO> getAllUser(String eid, String keyword,List<Long> roleIdList) {
+        return enterpriseUserMapper.getAllUser(eid, keyword,roleIdList);
     }
 
     public List<EnterpriseUserDO> findUserInfoByUserIdsAndKeyword(List<String> userIdList, String keyword) {
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
index 882a9f452..84f81fe74 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
@@ -90,7 +90,7 @@ public interface EnterpriseUserMapper {
      */
     List<EnterpriseUserDO> getUserListByRegionId( @Param("regionId") Long regionId);
 
-    List<UserDTO> getAllUser(@Param("eid")String id, @Param("keyword") String keyword);
+    List<UserDTO> getAllUser(@Param("eid")String id, @Param("keyword") String keyword, @Param("roleIdList") List<Long> roleIdList);
 
     /**
      * 根据用户id和关键字搜索用户
diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
index 33c3daa89..0087d2be9 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
@@ -176,13 +176,19 @@
     </select>
     <select id="getAllUser" resultType="com.cool.store.dto.UserDTO">
         select
-        user_id as userId,
-        name,
-        mobile
-        from enterprise_user_${eid}
+        a.user_id as userId,
+        a.name,
+        a.mobile,b.role_id
+        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>
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
index 00cfd10eb..092afe3cb 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
@@ -479,7 +479,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
     @Override
     public PageInfo<UserDTO> getAllUser(String keyword, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<UserDTO> allUser = enterpriseUserDAO.getAllUser(eid, keyword);
+        List<UserDTO> allUser = enterpriseUserDAO.getAllUser(eid, keyword,Arrays.asList(UserRoleEnum.SUPERVISION.getCode(), UserRoleEnum.QW_SUPERVISION.getCode()));
         return new PageInfo<>(allUser);
     }