fix(缺陷管理): 缺陷关联用例模块筛选及表头支持排序

backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java

@@ -773,16 +773,22 @@ public class BugService {
         } else {
             bug.setPlatformBugId(platformBug.getPlatformBugKey());
             if (StringUtils.isNotBlank(platformBug.getPlatformTitle())) {
-               bug.setTitle(platformBug.getPlatformTitle());
+                bug.setTitle(platformBug.getPlatformTitle());
             }
             if (StringUtils.isNotBlank(platformBug.getPlatformDescription())) {
-               request.setDescription(platformBug.getPlatformDescription());
+                request.setDescription(platformBug.getPlatformDescription());
             }
             if (StringUtils.isNotBlank(platformBug.getPlatformHandleUser())) {
-               bug.setHandleUser(platformBug.getPlatformHandleUser());
+                bug.setHandleUser(platformBug.getPlatformHandleUser());
+            } else {
+                // 平台处理人为空
+                bug.setHandleUser(StringUtils.EMPTY);
             }
             if (StringUtils.isNotBlank(platformBug.getPlatformStatus())) {
-               bug.setStatus(platformBug.getPlatformStatus());
+                bug.setStatus(platformBug.getPlatformStatus());
+            } else {
+                // 平台状态为空
+                bug.setStatus(StringUtils.EMPTY);
             }
             // 第三方平台内置的处理人字段需要从自定义字段中移除
             request.getCustomFields().removeIf(field -> StringUtils.startsWith(field.getName(), BugTemplateCustomField.HANDLE_USER.getName()));

backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml

@@ -711,7 +711,6 @@
         fc.tags,
         pv.name as versionName
         from functional_case fc left join project_version pv ON fc.version_id = pv.id
-            left join functional_case_module fcm on fcm.id = fc.module_id
         where fc.deleted = #{deleted}
             and fc.project_id = #{request.projectId}
             and fc.version_id = #{request.versionId}
@@ -732,7 +731,6 @@
     <select id="getSelectIdsByAssociateParam" resultType="java.lang.String">
         select fc.id
         from functional_case fc
-        left join functional_case_module fcm on fcm.id = fc.module_id
         where fc.deleted = #{deleted}
             and fc.project_id = #{request.projectId}
             and fc.version_id = #{request.versionId}
@@ -751,8 +749,8 @@
             )
         </if>
         <if test="request.moduleIds != null and request.moduleIds.size() > 0">
-            and fcm.module_id in
-            <foreach collection="moduleIds" item="moduleId" open="(" separator="," close=")">
+            and fc.module_id in
+            <foreach collection="request.moduleIds" item="moduleId" open="(" separator="," close=")">
                 #{moduleId}
             </foreach>
         </if>
@@ -766,7 +764,7 @@
             )
         </if>
         <if test="request.moduleIds != null and request.moduleIds.size() > 0">
-            and fcm.module_id in
+            and fc.module_id in
             <foreach collection="request.moduleIds" item="moduleId" open="(" separator="," close=")">
                 #{moduleId}
             </foreach>

frontend/src/views/bug-management/index.vue

@@ -295,18 +295,8 @@ const { t } = useI18n();
     },
     {
       title: 'bugManagement.creator',
-      dataIndex: 'createUserName',
-      width: 112,
-      showTooltip: true,
-      showDrag: true,
-      sortable: {
-        sortDirections: ['ascend', 'descend'],
-        sorter: true,
-      }
-    },
-    {
-      title: 'bugManagement.updateUser',
-      dataIndex: 'updateUserName',
+      slotName: 'createUserName',
+      dataIndex: 'createUser',
       width: 112,
       showTooltip: true,
       showDrag: true,
@@ -325,6 +315,18 @@ const { t } = useI18n();
         sorter: true,
       }
     },
+    {
+      title: 'bugManagement.updateUser',
+      slotName: 'updateUserName',
+      dataIndex: 'updateUser',
+      width: 112,
+      showTooltip: true,
+      showDrag: true,
+      sortable: {
+        sortDirections: ['ascend', 'descend'],
+        sorter: true,
+      }
+    },
     {
       title: 'bugManagement.updateTime',
       dataIndex: 'updateTime',
@@ -359,6 +361,8 @@ const { t } = useI18n();
       (record: TableData) => ({
         ...record,
         handleUser: record.handleUserName,
+        createUser: record.createUserName,
+        updateUser: record.updateUserName,
         ...customFieldDataToTableData(record.customFields, customFields.value),
       })
     );