Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

app/controllers/api/pm/issues_controller.rb

@@ -261,8 +261,8 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
     end
     full_link_issues_ids = full_link_issues_ids - exclude_issues_ids
     @requirement_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:1, root_id: nil).pm_includes
-    @task_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:2, root_id: nil).pm_includes
-    @bug_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:3, root_id: nil).pm_includes
+    @task_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:2).pm_includes
+    @bug_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:3).pm_includes
   end
 
   private

app/controllers/api/pm/projects_controller.rb

@@ -73,9 +73,9 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
       }
     end
     open_data = {
-      "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i,
-      "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i,
-      "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i,
+      "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i + type_status_data[1][3].to_i + type_status_data[1][6].to_i,
+      "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i + type_status_data[2][3].to_i + type_status_data[2][6].to_i,
+      "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i + type_status_data[3][3].to_i + type_status_data[3][6].to_i,
     }
     if type_count_data.keys.size < 3
       nedd_add = [1,2,3] - type_count_data.keys