From f2da9e068dcb1188a005cd7c361332fa0e542254 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Mon, 4 Sep 2023 18:46:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/project/mapper/ExtProjectMemberMapper.xml  | 4 ++--
 .../io/metersphere/project/service/ProjectMemberService.java  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectMemberMapper.xml b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectMemberMapper.xml
index c6a5f4e61d..b99258e483 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectMemberMapper.xml
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/mapper/ExtProjectMemberMapper.xml
@@ -31,12 +31,12 @@
     </select>
 
     <sql id="filter">
-        <if test="request.filter != null and request.filter.size() > 0">
+        <if test="request.filter != null">
             <foreach collection="request.filter.entrySet()" index="key" item="values">
                 <if test="values != null and values.size() > 0">
                     <choose>
                         <when test="key == 'roleIds'">
-                            and urr.id in
+                            and urr.role_id in
                             <include refid="io.metersphere.sdk.mapper.BaseMapper.filterInWrapper"/>
                         </when>
                     </choose>
diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java
index 752d4152cf..0ac68bad1c 100644
--- a/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java
+++ b/backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectMemberService.java
@@ -17,7 +17,6 @@ import io.metersphere.sdk.exception.MSException;
 import io.metersphere.sdk.log.constants.OperationLogModule;
 import io.metersphere.sdk.log.constants.OperationLogType;
 import io.metersphere.sdk.log.service.OperationLogService;
-import io.metersphere.sdk.mapper.BaseUserMapper;
 import io.metersphere.sdk.util.BeanUtils;
 import io.metersphere.sdk.util.JSON;
 import io.metersphere.sdk.util.Translator;
@@ -49,8 +48,6 @@ public class ProjectMemberService {
     @Resource
     private UserRoleRelationMapper userRoleRelationMapper;
     @Resource
-    private BaseUserMapper baseUserMapper;
-    @Resource
     private ProjectMapper projectMapper;
     @Resource
     private ExtProjectMemberMapper extProjectMemberMapper;