From 25d3f18875e4a4529529302fb7358d3a60b7d98a Mon Sep 17 00:00:00 2001
From: AgAngle <1323481023@qq.com>
Date: Mon, 28 Aug 2023 15:51:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84=E6=9F=A5=E7=9C=8B=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4=E5=B7=B2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/sdk/mapper/BaseUserMapper.xml  | 10 +++++-----
 .../system/mapper/ExtUserRoleRelationMapper.xml   | 15 +++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/mapper/BaseUserMapper.xml b/backend/framework/sdk/src/main/java/io/metersphere/sdk/mapper/BaseUserMapper.xml
index 98c1b990b7..702fc4cd94 100644
--- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/mapper/BaseUserMapper.xml
+++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/mapper/BaseUserMapper.xml
@@ -21,13 +21,13 @@
         FROM user
                  LEFT JOIN user_extend ON user.id = user_extend.id
         WHERE (user.email = #{keyword} OR user.id = #{keyword})
-          AND deleted IS FALSE
+          AND deleted = 0
     </select>
 
     <select id="findAll" resultType="io.metersphere.system.domain.User">
         SELECT *
         FROM user
-        where deleted IS FALSE
+        where deleted = 0
     </select>
 
     <insert id="batchSave">
@@ -71,14 +71,14 @@
             *
         </if>
         FROM user
-        WHERE DELETED IS FALSE
+        WHERE DELETED = 0
         <if test="keyword != null and keyword != ''">
             AND name LIKE CONCAT('%', #{keyword}, '%')
             OR email LIKE CONCAT('%', #{keyword}, '%')
         </if>
     </select>
     <select id="selectUnDeletedUserIdByIdList" resultType="java.lang.String">
-        SELECT * from `user` WHERE deleted IS FALSE AND id IN
+        SELECT * from `user` WHERE deleted = 0 AND id IN
         <foreach collection="idList" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -96,7 +96,7 @@
     <select id="getExcludeSelectOption" resultType="io.metersphere.sdk.dto.ExcludeOptionDTO">
         select id, name
         from user
-        where deleted is false
+        where deleted = 0
     </select>
     <select id="getSelectOptionByIdsWithDeleted" resultType="io.metersphere.sdk.dto.OptionDTO">
         SELECT id, name
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleRelationMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleRelationMapper.xml
index b9b5ab8b42..5f60f82e08 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleRelationMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtUserRoleRelationMapper.xml
@@ -14,18 +14,17 @@
         )
     </select>
     <select id="selectGlobalRoleByUserId" resultType="io.metersphere.system.domain.UserRoleRelation">
-        SELECT * FROM
-        user_role_relation
-        WHERE
-        user_id = #{userId}
-        AND role_id IN (
-            SELECT id FROM user_role WHERE type = 'SYSTEM' AND scope_id = 'global'
-            )
+        SELECT *
+        FROM user_role_relation
+        WHERE user_id = #{userId}
+          AND role_id IN (SELECT id
+                          FROM user_role
+                          WHERE type = 'SYSTEM' AND scope_id = 'global')
     </select>
     <select id="listGlobal" resultType="io.metersphere.sdk.dto.UserRoleRelationUserDTO">
         select urr.id, u.id as userId, u.name, u.email, u.phone
         from user_role_relation urr
-        inner join user u on urr.user_id = u.id and urr.role_id = #{request.roleId}
+        inner join user u on urr.user_id = u.id and urr.role_id = #{request.roleId} and u.deleted = 0
         <if test="request.keyword != null">
             and (
                 u.name like concat('%', #{request.keyword},'%')