From ff67cfedc877ed33ec2204e421bad3170b679242 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 15 Feb 2023 14:37:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E5=85=B1=E4=BA=AB=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1023026 --user=李玉号 【项目管理】在项目中创建用户组-开启工作空间共享，创建后在项目中不显示
https://www.tapd.cn/55049933/s/1335581
---
 .../base/mapper/ext/ExtGroupMapper.xml          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/project-management/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml b/project-management/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml
index 7a2970a848..632d3e8561 100644
--- a/project-management/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml
+++ b/project-management/backend/src/main/java/io/metersphere/base/mapper/ext/ExtGroupMapper.xml
@@ -8,6 +8,23 @@
         (SELECT COUNT(DISTINCT ug.user_id) FROM user_group ug JOIN user ON ug.user_id = user.id WHERE ug.group_id =
         temp.id AND ug.source_id = #{request.projectId}) AS memberSize
         FROM (
+        SELECT g.*, w.name AS scopeName FROM `group` g, workspace w
+        <where>
+            and g.scope_id = w.id
+            <if test="request.types != null and request.types.size() > 0">
+                AND g.type IN
+                <foreach collection="request.types" item="type" separator="," open="(" close=")">
+                    #{type}
+                </foreach>
+            </if>
+            <if test="request.scopes != null and request.scopes.size() > 0">
+                AND g.scope_id IN
+                <foreach collection="request.scopes" item="scope" separator="," open="(" close=")">
+                    #{scope}
+                </foreach>
+            </if>
+        </where>
+        UNION DISTINCT
         SELECT g.*, 'global' AS scopeName FROM `group` g
         <where>
             g.scope_id = 'global'