From db5182f37d2e76b440a768180d37cb2343d87c7c Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 1 Feb 2024 09:56:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/system/mapper/ExtOrganizationMapper.xml  | 8 ++++----
 .../system/controller/OrganizationControllerTests.java   | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml
index 44e43a6cef..e9953039be 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtOrganizationMapper.xml
@@ -101,11 +101,11 @@
     <select id="selectListMemberByOrg" resultType="io.metersphere.system.dto.OptionDisabledDTO">
         select u.id, u.name
         from user u
-        where u.deleted = 0
+        where u.deleted = false
         <if test="keyword != null and keyword != ''">
-            and (u.name like CONCAT('%', #{request.keyword},'%')
-            or u.email like CONCAT('%', #{request.keyword},'%')
-            or u.phone like CONCAT('%', #{request.keyword},'%'))
+            and (u.name like CONCAT('%', #{keyword},'%')
+            or u.email like CONCAT('%', #{keyword},'%')
+            or u.phone like CONCAT('%', #{keyword},'%'))
         </if>
         order by u.update_time desc
         limit 100
diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java
index cf71f6e3fb..e99d2f6ba5 100644
--- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java
+++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/OrganizationControllerTests.java
@@ -1,17 +1,17 @@
 package io.metersphere.system.controller;
 
-import io.metersphere.system.base.BaseTest;
 import io.metersphere.sdk.constants.InternalUserRole;
 import io.metersphere.sdk.constants.SessionConstants;
-import io.metersphere.system.controller.handler.ResultHolder;
-import io.metersphere.system.dto.sdk.OptionDTO;
 import io.metersphere.sdk.util.JSON;
-import io.metersphere.system.utils.Pager;
+import io.metersphere.system.base.BaseTest;
+import io.metersphere.system.controller.handler.ResultHolder;
 import io.metersphere.system.dto.OrgUserExtend;
 import io.metersphere.system.dto.request.OrgMemberExtendProjectRequest;
 import io.metersphere.system.dto.request.OrganizationMemberExtendRequest;
 import io.metersphere.system.dto.request.OrganizationMemberUpdateRequest;
 import io.metersphere.system.dto.request.OrganizationRequest;
+import io.metersphere.system.dto.sdk.OptionDTO;
+import io.metersphere.system.utils.Pager;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -432,6 +432,7 @@ public class OrganizationControllerTests extends BaseTest {
         MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.get("/organization/not-exist/user/list/sys_default_organization_3")
                         .header(SessionConstants.HEADER_TOKEN, sessionId)
                         .header(SessionConstants.CSRF_TOKEN, csrfToken)
+                        .param("keyword", "test")
                         .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON)).andReturn();