From 284a4ccfae49ca4beea2a48bb96c042395f13120 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Thu, 30 Mar 2023 14:19:26 +0800
Subject: [PATCH] * Finish task#88964.

---
 db/update18.3.sql              |  3 +++
 module/group/lang/resource.php | 14 --------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/db/update18.3.sql b/db/update18.3.sql
index 20c5c34cee..cf8ad6fb85 100644
--- a/db/update18.3.sql
+++ b/db/update18.3.sql
@@ -66,3 +66,6 @@ CREATE TABLE `zt_pivot`  (
   KEY(`dimension`),
   KEY(`group`)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
+
+update `zt_grouppriv` set module = 'pivot' where method in ('projectDeviation','productSummary', 'bugCreate', 'bugAssign', 'workload', 'showProduct', 'showProject') and module = 'report'
+update `zt_grouppriv` set module = 'screen' where method in ('annualData','allAnnualData') and module = 'report'
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 4047a0a235..fb5efd4a1f 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1772,22 +1772,8 @@ $lang->screen->methodOrder[5]  = 'view';
 /* Report. */
 $lang->resource->report = new stdclass();
 $lang->resource->report->index            = 'index';
-$lang->resource->report->projectDeviation = 'projectDeviation';
-$lang->resource->report->productSummary   = 'productSummary';
-$lang->resource->report->bugCreate        = 'bugCreate';
-$lang->resource->report->bugAssign        = 'bugAssign';
-$lang->resource->report->workload         = 'workload';
-$lang->resource->report->annualData       = 'annual';
-$lang->resource->report->allAnnualData    = 'viewEveryoneAnnual';
 
 $lang->report->methodOrder[0]  = 'index';
-$lang->report->methodOrder[5]  = 'projectDeviation';
-$lang->report->methodOrder[10] = 'productSummary';
-$lang->report->methodOrder[15] = 'bugCreate';
-$lang->report->methodOrder[20] = 'bugAssign';
-$lang->report->methodOrder[25] = 'workload';
-$lang->report->methodOrder[30] = 'annual';
-$lang->report->methodOrder[35] = 'allAnnualData';
 
 /* Search. */
 $lang->resource->search = new stdclass();