From d5a87f5f04e9a15c8cfd68df121db903005b8ff5 Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Wed, 22 May 2024 11:17:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=A0=91=E8=8A=82=E7=82=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=9C=AA=E8=A2=AB=E5=88=A0=E9=99=A4&&?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E8=AF=A6=E6=83=85=E7=BC=BA=E9=99=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8E=BB=E9=87=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metersphere/plan/mapper/ExtTestPlanMapper.xml |  3 ++-
 .../plan/mapper/ExtTestPlanModuleMapper.java      |  2 ++
 .../plan/mapper/ExtTestPlanModuleMapper.xml       |  8 ++++++++
 .../plan/mapper/ExtTestPlanReportBugMapper.xml    |  2 +-
 .../plan/service/TestPlanModuleService.java       | 15 +++++++++------
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
index 8ac1b8ee31..dea57543e5 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanMapper.xml
@@ -235,9 +235,10 @@
     <select id="countModuleIdByConditions"
             parameterType="io.metersphere.plan.dto.TestPlanQueryConditions"
             resultType="io.metersphere.project.dto.ModuleCountDTO">
-        SELECT t.module_id AS moduleId, count(t.id) AS dataCount
+        SELECT t.module_id AS moduleId, count(distinct t.id) AS dataCount
         FROM test_plan t
         INNER JOIN user createUser ON t.create_user = createUser.id
+        INNER JOIN test_plan_module tpm on (tpm.id = t.module_id or t.module_id = 'root')
         <include refid="test_plan_page_request"/>
         GROUP BY t.module_id
     </select>
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.java
index 08fc6e606c..804f7f5082 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.java
@@ -16,6 +16,8 @@ public interface ExtTestPlanModuleMapper {
 
     List<String> selectChildrenIdsByParentIds(@Param("ids") List<String> strings);
 
+    List<String> selectPlanIdsByModuleIds(@Param("ids") List<String> strings);
+
     void deleteByIds(@Param("ids") List<String> deleteId);
 
     BaseModule selectBaseModuleById(String dragNodeId);
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.xml
index 36e245e299..d92dd2099c 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanModuleMapper.xml
@@ -29,6 +29,14 @@
             #{id}
         </foreach>
     </select>
+
+    <select id="selectPlanIdsByModuleIds" resultType="java.lang.String">
+        SELECT id FROM test_plan WHERE module_id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <select id="selectBaseModuleById" resultType="io.metersphere.system.dto.sdk.BaseModule">
         SELECT id, name, pos, project_Id, parent_id
         FROM test_plan_module
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml
index 0657a77c96..2941cd53cb 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/mapper/ExtTestPlanReportBugMapper.xml
@@ -11,7 +11,7 @@
     </select>
 
     <select id="list" resultType="io.metersphere.bug.dto.response.BugDTO">
-        select tprb.bug_id as id, tprb.bug_num as num, tprb.bug_title as title, tprb.bug_status as status, tprb.bug_handle_user as handleUserName,
+        select distinct tprb.bug_id as id, tprb.bug_num as num, tprb.bug_title as title, tprb.bug_status as status, tprb.bug_handle_user as handleUserName,
             tprb.bug_case_count as relationCaseCount
         from test_plan_report_bug tprb
         where tprb.test_plan_report_id = #{request.reportId}
diff --git a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanModuleService.java b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanModuleService.java
index 2d06040af3..83bbd3d180 100644
--- a/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanModuleService.java
+++ b/backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanModuleService.java
@@ -141,12 +141,15 @@ public class TestPlanModuleService extends ModuleTreeService {
             return;
         }
         extTestPlanModuleMapper.deleteByIds(deleteIds);
-
-        TestPlanBatchProcessRequest request = new TestPlanBatchProcessRequest();
-        request.setModuleIds(deleteIds);
-        request.setSelectAll(true);
-        request.setProjectId(projectId);
-        testPlanService.batchDelete(request, operator, requestUrl, requestMethod);
+        List<String> planDeleteIds = extTestPlanModuleMapper.selectPlanIdsByModuleIds(deleteIds);
+        if (CollectionUtils.isNotEmpty(planDeleteIds)) {
+            TestPlanBatchProcessRequest request = new TestPlanBatchProcessRequest();
+            request.setModuleIds(deleteIds);
+            request.setSelectAll(false);
+            request.setProjectId(projectId);
+            request.setSelectIds(planDeleteIds);
+            testPlanService.batchDelete(request, operator, requestUrl, requestMethod);
+        }
 
         List<String> childrenIds = extTestPlanModuleMapper.selectChildrenIdsByParentIds(deleteIds);
         if (CollectionUtils.isNotEmpty(childrenIds)) {