From 501a7563ac6ebc89248d7a7759020964da2d47a8 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Fri, 15 Mar 2024 20:04:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=BC=BA=E9=99=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B=E9=83=A8?=
 =?UTF-8?q?=E5=88=86BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1036902 --user=宋昌昌 【缺陷管理】缺陷详情-用例-关联用例-后关联的用例应该显示在顶部 https://www.tapd.cn/55049933/s/1476591
--bug=1036912 --user=宋昌昌 【缺陷管理】缺陷详情-用例-关联用例-左侧搜索模块未匹配模块提示文案修改 https://www.tapd.cn/55049933/s/1476600
--bug=1036913 --user=宋昌昌 【缺陷管理】缺陷详情-用例-关联用例-跨项目关联提示无权限 https://www.tapd.cn/55049933/s/1476604
---
 .../io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml  | 1 +
 .../metersphere/project/service/ProjectMemberService.java | 2 +-
 .../system/service/OrganizationUserRoleService.java       | 8 +++-----
 .../src/components/business/ms-case-associate/index.vue   | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
index 1501ba87d6..5171b5717b 100644
--- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
+++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugRelateCaseMapper.xml
@@ -54,6 +54,7 @@
             or fc.num like concat('%', #{request.keyword}, '%')
             )
         </if>
+        order by brc.id desc
     </select>
 
     <select id="getRelateCase" resultType="io.metersphere.bug.dto.response.BugRelateCaseDTO">
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 d51cbccdb3..f5ee0750a8 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
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
  * @author song-cc-rock
  */
 @Service
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class ProjectMemberService {
 
     @Resource
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java
index db871cf679..b939a63840 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java
@@ -11,7 +11,9 @@ import io.metersphere.system.dto.permission.PermissionDefinitionItem;
 import io.metersphere.system.dto.request.OrganizationUserRoleMemberEditRequest;
 import io.metersphere.system.dto.request.OrganizationUserRoleMemberRequest;
 import io.metersphere.system.dto.sdk.request.PermissionSettingUpdateRequest;
-import io.metersphere.system.mapper.*;
+import io.metersphere.system.mapper.ExtUserRoleMapper;
+import io.metersphere.system.mapper.UserRoleMapper;
+import io.metersphere.system.mapper.UserRoleRelationMapper;
 import io.metersphere.system.uid.IDGenerator;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -32,16 +34,12 @@ import static io.metersphere.system.controller.result.SystemResultCode.NO_ORG_US
 @Transactional(rollbackFor = Exception.class)
 public class OrganizationUserRoleService extends BaseUserRoleService {
 
-    @Resource
-    UserMapper userMapper;
     @Resource
     UserRoleMapper userRoleMapper;
     @Resource
     ExtUserRoleMapper extUserRoleMapper;
     @Resource
     UserRoleRelationMapper userRoleRelationMapper;
-    @Resource
-    ExtUserMapper extUserMapper;
 
     public List<UserRole> list(String organizationId) {
         UserRoleExample example = new UserRoleExample();
diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue
index 8810d432b4..e6c4f7649c 100644
--- a/frontend/src/components/business/ms-case-associate/index.vue
+++ b/frontend/src/components/business/ms-case-associate/index.vue
@@ -62,7 +62,7 @@
             v-model:selected-keys="selectedModuleKeys"
             :data="folderTree"
             :keyword="moduleKeyword"
-            :empty-text="t('caseManagement.featureCase.caseEmptyRecycle')"
+            :empty-text="t('common.noData')"
             :virtual-list-props="virtualListProps"
             :field-names="{
               title: 'name',