修复bug

src/main/java/com/mooctest/controller/ReportController.java

@@ -196,6 +196,7 @@ public class ReportController {
             model.addAttribute("hasMaster",true);
             String masterId = masterReportSource.getMasterId();
             finalReports.addAll(finalReportService.getBySourceId(masterId)); // 和这份报告suoshu julei baogao de fincal bgoa
+
             model.addAttribute("masterName","ML-AG-"+masterId.substring(10));
             model.addAttribute("masterUrl","/report?masterId="+masterId+"&examId="+examId+"&caseId="+caseId);
         }
@@ -204,10 +205,12 @@ public class ReportController {
             model.addAttribute("hasTree",false);
         }else{
             model.addAttribute("hasTree",true);
-            finalReports.addAll(finalReportService.getBySourceId(treeReportId)); // 和这份报告suoshu julei baogao de fincal bgoa
+//            finalReports.addAll(finalReportService.getBySourceId(treeReportId)); // 和这份报告suoshu julei baogao de fincal bgoa
+            addDistinctFinalReport(finalReports,finalReportService.getBySourceId(treeReportId));
             model.addAttribute("treeName","ML-TR-"+getShortId(treeReportId));
             model.addAttribute("treeUrl","/history/report?treeId="+treeReportId+"&examId="+examId+"&caseId="+caseId);
         }
+
 //        Map<String, BugDTO> bugMap = bugReportService.getAllBugsMap(examId, caseId);
 //        BugDTO masterReport = bugMap.get(masterId);
         model.addAttribute("singleReport",singleReport);//
@@ -393,4 +396,21 @@ public class ReportController {
         model.addAttribute("caseId", caseId);
         return "test";
     }
+
+    private void addDistinctFinalReport( List<FinalReportDTO>source , List<FinalReportDTO> adds ){
+        List<FinalReportDTO> shouldAdds = new ArrayList<>();
+        for(FinalReportDTO d : adds){
+            boolean flag = true;
+            for(FinalReportDTO x : source){
+                if( x.getId() == d.getId()){
+                    flag = false;
+                    break ;
+                }
+            }
+            if(flag){
+                shouldAdds.add(d);
+            }
+        }
+        source.addAll(shouldAdds);
+    }
 }

src/main/resources/templates/agg_report_new.html

@@ -621,7 +621,7 @@
     }
     function hideCreateBlock() {
         if (finalReportId){
-  h          /*<![CDATA[*/
+            /*<![CDATA[*/
             // window.location.href='report?masterId='+masterId+'&examId='+examId+'&caseId='+caseId
             // loadPartReports()
             $("#create_bug").show()

src/main/resources/templates/tree_report_new.html

@@ -447,6 +447,7 @@
     var word_list = /*[[${wordList}]]*/;  //源代码如此
     var urlParams = new URLSearchParams(window.location.search);
     var treeId = urlParams.get('treeId');
+    var masterId = treeId ;
     var examId = urlParams.get('examId');
     var caseId = urlParams.get('caseId');
     var finalReportId = urlParams.get('finalReportId');
@@ -554,7 +555,7 @@
     }
     function hideCreateBlock() {
         if (finalReportId){
-            h          /*<![CDATA[*/
+                      /*<![CDATA[*/
             // window.location.href='report?masterId='+masterId+'&examId='+examId+'&caseId='+caseId
             // loadPartReports()
             $("#create_bug").show()
@@ -618,7 +619,7 @@
         //填充编辑表单页面。
         /*<![CDATA[*/
         $.ajax({
-            url: '/editReportData?masterId='+masterId+'&finalReportId='+finalId,
+                url: '/editReportData?masterId='+treeId+'&finalReportId='+finalId,
             type: 'GET',
             success: function (result) {
                 console.log(result); //