From 47b133b64d3082dd0f67296b6054049b27c7c290 Mon Sep 17 00:00:00 2001
From: AnAngle <1323481023@qq.com>
Date: Tue, 6 Sep 2022 22:49:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=85=81=E8=AE=B8=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E4=BE=8B=EF=BC=8C=E5=85=B3=E8=81=94=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=94=A8=E4=BE=8B=E6=A8=A1=E5=9D=97=E6=A0=91=E4=BE=9D?=
 =?UTF-8?q?=E7=84=B6=E8=A2=AB=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1016596 --user=陈建星 【测试跟踪】github #17675，2.1版本测试计划按模块重复关联测试用例失败 https://www.tapd.cn/55049933/s/1239696
---
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml  | 8 ++++++--
 .../io/metersphere/track/service/TestCaseNodeService.java | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 4e7124cf1a..5c631206f9 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -323,10 +323,14 @@
     <select id="getTestPlanRelateCountNodes" resultType="io.metersphere.track.dto.TestCaseNodeDTO">
         select tcn.id, count(*) as caseNum, test_case.project_id
         from test_case
-        left join test_plan_test_case tptc on tptc.case_id = test_case.id and tptc.plan_id = #{request.planId}
+        <if test="!request.repeatCase">
+            left join test_plan_test_case tptc on tptc.case_id = test_case.id and tptc.plan_id = #{request.planId}
+        </if>
         left join test_case_node tcn on test_case.node_id = tcn.id
         <include refid="queryWhereCondition"/>
-        and tptc.case_id is null
+        <if test="!request.repeatCase">
+            and tptc.case_id is null
+        </if>
         group by tcn.id
     </select>
     <select id="getTestReviewRelateCountNodes" resultType="io.metersphere.track.dto.TestCaseNodeDTO">
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
index ffc68ee1ed..c6703bed6c 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
@@ -36,6 +36,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionUtils;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -66,6 +67,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
     ProjectMapper projectMapper;
     @Resource
     ExtTestReviewCaseMapper extTestReviewCaseMapper;
+    @Resource
+    @Lazy
+    TestPlanService testPlanService;
 
     public TestCaseNodeService() {
         super(TestCaseNodeDTO.class);
@@ -353,6 +357,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
 
     public List<TestCaseNodeDTO> getRelatePlanNodes(QueryTestCaseRequest request) {
         request.setNodeIds(null);
+        if (testPlanService.isAllowedRepeatCase(request.getPlanId())) {
+            request.setRepeatCase(true);
+        }
         List<TestCaseNodeDTO> countMNodes = extTestCaseMapper.getTestPlanRelateCountNodes(request);
         List<TestCaseNodeDTO> testCaseNodes = extTestCaseNodeMapper.getNodeTreeByProjectId(request.getProjectId());
         return getNodeTreeWithPruningTreeByCaseCount(testCaseNodes, getCountMap(countMNodes));