From 477e89a09e4503cd8189ff005bf1a9caa0228d09 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Fri, 11 Mar 2022 14:03:30 +0800
Subject: [PATCH] * Fix bug.

---
 db/update16.4.sql      |   8 +-
 db/zentao.sql          | 239 ++---------------------------------------
 module/doc/model.php   |   6 +-
 module/story/model.php |   5 +-
 module/task/model.php  |   1 +
 5 files changed, 27 insertions(+), 232 deletions(-)

diff --git a/db/update16.4.sql b/db/update16.4.sql
index 4beb54b6f8..7b1092792c 100644
--- a/db/update16.4.sql
+++ b/db/update16.4.sql
@@ -28,7 +28,13 @@ ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`;
 UPDATE `zt_user` SET `visions`='rnd,lite';
 
 INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES
-('lite', '迅捷版用户分组', 'liteUser', '迅捷版用户分组');
+('lite', '管理员', 'liteUser', '迅捷版用户分组');
+
+INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES
+('lite', '项目管理', 'liteUser', '迅捷版用户分组');
+
+INSERT INTO `zt_group` (`vision`, `name`, `role`, `desc`) VALUES
+('lite', '团队成员', 'liteUser', '迅捷版用户分组');
 
 ALTER TABLE `zt_productplan` ADD `closedReason` varchar(20) NOT NULL AFTER `order`;
 
diff --git a/db/zentao.sql b/db/zentao.sql
index 0707a37ac2..498be0bb99 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -5987,232 +5987,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11,'user','view'),
 (12,'my','limited');
 
-INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
-(14,'action','comment'),
-(14,'action','editComment'),
-(14,'action','trash'),
-(14,'action','undelete'),
-(14,'admin','checkWeak'),
-(14,'admin','index'),
-(14,'admin','safe'),
-(14,'api','debug'),
-(14,'company','browse'),
-(14,'company','dynamic'),
-(14,'company','edit'),
-(14,'company','index'),
-(14,'company','view'),
-(14,'custom','execution'),
-(14,'custom','flow'),
-(14,'custom','index'),
-(14,'custom','product'),
-(14,'custom','restore'),
-(14,'custom','set'),
-(14,'custom','setPublic'),
-(14,'datatable','setGlobal'),
-(14,'dept','browse'),
-(14,'dept','delete'),
-(14,'dept','edit'),
-(14,'dept','manageChild'),
-(14,'dept','updateOrder'),
-(14,'dev','api'),
-(14,'dev','db'),
-(14,'dev','editor'),
-(14,'doc','allLibs'),
-(14,'doc','browse'),
-(14,'doc','collect'),
-(14,'doc','create'),
-(14,'doc','createLib'),
-(14,'doc','delete'),
-(14,'doc','deleteFile'),
-(14,'doc','deleteLib'),
-(14,'doc','edit'),
-(14,'doc','editLib'),
-(14,'doc','index'),
-(14,'doc','objectLibs'),
-(14,'doc','showFiles'),
-(14,'doc','tableContents'),
-(14,'doc','view'),
-(14,'execution','all'),
-(14,'execution','browse'),
-(14,'execution','bug'),
-(14,'execution','build'),
-(14,'execution','burn'),
-(14,'execution','burnData'),
-(14,'execution','computeBurn'),
-(14,'execution','doc'),
-(14,'execution','dynamic'),
-(14,'execution','executionkanban'),
-(14,'execution','fixFirst'),
-(14,'execution','grouptask'),
-(14,'execution','kanban'),
-(14,'execution','manageMembers'),
-(14,'execution','printKanban'),
-(14,'execution','story'),
-(14,'execution','storyEstimate'),
-(14,'execution','storyKanban'),
-(14,'execution','task'),
-(14,'execution','team'),
-(14,'execution','tree'),
-(14,'execution','treeStory'),
-(14,'execution','treeTask'),
-(14,'execution','view'),
-(14,'execution','whitelist'),
-(14,'file','delete'),
-(14,'file','download'),
-(14,'file','edit'),
-(14,'file','setPublic'),
-(14,'file','uploadImages'),
-(14,'group','browse'),
-(14,'index','index'),
-(14,'message','browser'),
-(14,'message','index'),
-(14,'message','setting'),
-(14,'misc','ping'),
-(14,'my','bug'),
-(14,'my','calendar'),
-(14,'my','changePassword'),
-(14,'my','contribute'),
-(14,'my','deleteContacts'),
-(14,'my','doc'),
-(14,'my','dynamic'),
-(14,'my','editProfile'),
-(14,'my','execution'),
-(14,'my','index'),
-(14,'my','manageContacts'),
-(14,'my','preference'),
-(14,'my','profile'),
-(14,'my','project'),
-(14,'my','score'),
-(14,'my','story'),
-(14,'my','task'),
-(14,'my','team'),
-(14,'my','todo'),
-(14,'my','uploadAvatar'),
-(14,'my','work'),
-(14,'personnel','accessible'),
-(14,'personnel','invest'),
-(14,'personnel','whitelist'),
-(14,'product','all'),
-(14,'product','browse'),
-(14,'product','build'),
-(14,'product','dashboard'),
-(14,'product','dynamic'),
-(14,'product','index'),
-(14,'product','kanban'),
-(14,'product','project'),
-(14,'product','roadmap'),
-(14,'product','view'),
-(14,'product','whitelist'),
-(14,'productplan','browse'),
-(14,'productplan','view'),
-(14,'program','browse'),
-(14,'program','kanban'),
-(14,'program','product'),
-(14,'program','project'),
-(14,'program','stakeholder'),
-(14,'program','view'),
-(14,'project','browse'),
-(14,'project','bug'),
-(14,'project','build'),
-(14,'project','create'),
-(14,'project','dynamic'),
-(14,'project','edit'),
-(14,'project','execution'),
-(14,'project','index'),
-(14,'project','kanban'),
-(14,'project','manageMembers'),
-(14,'project','programTitle'),
-(14,'project','qa'),
-(14,'project','team'),
-(14,'project','testcase'),
-(14,'project','testreport'),
-(14,'project','testtask'),
-(14,'project','view'),
-(14,'project','whitelist'),
-(14,'projectbuild','browse'),
-(14,'projectrelease','browse'),
-(14,'projectrelease','view'),
-(14,'projectstory','story'),
-(14,'projectstory','track'),
-(14,'projectstory','view'),
-(14,'report','bugAssign'),
-(14,'report','bugCreate'),
-(14,'report','index'),
-(14,'report','productSummary'),
-(14,'report','projectDeviation'),
-(14,'report','workload'),
-(14,'search','buildForm'),
-(14,'search','buildIndex'),
-(14,'search','buildQuery'),
-(14,'search','deleteQuery'),
-(14,'search','index'),
-(14,'search','saveQuery'),
-(14,'search','select'),
-(14,'story','bugs'),
-(14,'story','cases'),
-(14,'story','report'),
-(14,'story','tasks'),
-(14,'story','track'),
-(14,'story','view'),
-(14,'task','activate'),
-(14,'task','assignTo'),
-(14,'task','batchAssignTo'),
-(14,'task','batchCancel'),
-(14,'task','batchChangeModule'),
-(14,'task','batchClose'),
-(14,'task','batchCreate'),
-(14,'task','batchEdit'),
-(14,'task','cancel'),
-(14,'task','close'),
-(14,'task','confirmStoryChange'),
-(14,'task','create'),
-(14,'task','delete'),
-(14,'task','deleteEstimate'),
-(14,'task','edit'),
-(14,'task','editEstimate'),
-(14,'task','export'),
-(14,'task','finish'),
-(14,'task','pause'),
-(14,'task','recordEstimate'),
-(14,'task','report'),
-(14,'task','restart'),
-(14,'task','start'),
-(14,'task','view'),
-(14,'todo','activate'),
-(14,'todo','assignTo'),
-(14,'todo','batchClose'),
-(14,'todo','batchCreate'),
-(14,'todo','batchEdit'),
-(14,'todo','batchFinish'),
-(14,'todo','close'),
-(14,'todo','create'),
-(14,'todo','createcycle'),
-(14,'todo','delete'),
-(14,'todo','edit'),
-(14,'todo','export'),
-(14,'todo','finish'),
-(14,'todo','import2Today'),
-(14,'todo','start'),
-(14,'todo','view'),
-(14,'tree','browse'),
-(14,'tree','browseTask'),
-(14,'tree','delete'),
-(14,'tree','edit'),
-(14,'tree','fix'),
-(14,'tree','manageChild'),
-(14,'tree','updateOrder'),
-(14,'user','batchEdit'),
-(14,'user','cropAvatar'),
-(14,'user','dynamic'),
-(14,'user','execution'),
-(14,'user','issue'),
-(14,'user','profile'),
-(14,'user','risk'),
-(14,'user','story'),
-(14,'user','task'),
-(14,'user','todo'),
-(14,'user','view');
-
 REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
 ('zh-cn', 'custom', 'URSRList', '1', '{\"SRName\":\"\\u8f6f\\u4ef6\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),('zh-cn', 'custom', 'URSRList', '2', '{\"SRName\":\"\\u7814\\u53d1\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'),
 ('zh-cn', 'custom', 'URSRList', '3', '{\"SRName\":\"\\u8f6f\\u9700\",\"URName\":\"\\u7528\\u9700\"}', '1'),('zh-cn', 'custom', 'URSRList', '4', '{\"SRName\":\"\\u6545\\u4e8b\",\"URName\":\"\\u53f2\\u8bd7\"}', '1'),
@@ -7047,8 +6821,6 @@ ALTER TABLE `zt_story` ADD `feedback` mediumint(8) unsigned NOT NULL DEFAULT '0'
 ALTER TABLE `zt_user`  ADD `feedback` enum('0', '1') NOT NULL DEFAULT '0' AFTER `locked`;
 ALTER TABLE `zt_group` ADD `developer` enum('0', '1') NOT NULL DEFAULT '1' AFTER `acl`;
 
-INSERT INTO `zt_group` (`name`, `role`, `desc`, `acl`, `developer`) VALUES ('FEEDBACK', 'feedback', 'Feedback', '', '0');
-
 -- DROP TABLE IF EXISTS `zt_feedbackproduct`;
 CREATE TABLE IF NOT EXISTS `zt_feedbackview` (
   `account` char(30) NOT NULL,
@@ -7593,7 +7365,7 @@ CREATE VIEW `view_datasource_5`  AS select `id`,`name` from `zt_task` where `del
 DROP VIEW IF EXISTS `view_datasource_46`;
 CREATE VIEW `view_datasource_46` AS select `id`,`name` from `zt_task` where `deleted` = '0' and vision = 'lite';
 
-UPDATE `zt_user` SET `visions` = 'lite' WHERE `feedback` = '1';
+UPDATE `zt_user` SET `visions` = 'lite', `feedback` = '0' WHERE `feedback` = '1';
 
 REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (1,'account','browse'),
@@ -13126,6 +12898,15 @@ REPLACE INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES
 (11,'workloadbudget','unlink'),
 (11,'workloadbudget','view');
 
+Insert into `zt_grouppriv`(`module`, `method`,`group`)
+select `module`, `method`,14 as `group` from `zt_grouppriv` where `group` in  (select `group` from `zt_grouppriv` where `group` = 1);
+
+Insert into `zt_grouppriv`(`module`, `method`,`group`)
+select `module`, `method`,15 as `group` from `zt_grouppriv` where `group` in  (select `group` from `zt_grouppriv` where `group` = 4);
+
+Insert into `zt_grouppriv`(`module`, `method`,`group`)
+select `module`, `method`,16 as `group` from `zt_grouppriv` where `group` in  (select `group` from `zt_grouppriv` where `group` = 9);
+
 REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES
 ('all', 'process', 'classify', 'support', '支持过程', '1'),
 ('all', 'process', 'classify', 'engineering', '工程支持', '1'),
diff --git a/module/doc/model.php b/module/doc/model.php
index 0467144b01..f885096230 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -501,7 +501,11 @@ class docModel extends model
      */
     public function getById($docID, $version = 0, $setImgSize = false)
     {
-        $doc = $this->dao->select('*')->from(TABLE_DOC)->where('id')->eq((int)$docID)->fetch();
+        $doc = $this->dao->select('*')->from(TABLE_DOC)
+            ->where('id')->eq((int)$docID)
+            ->andWhere('vision')->eq($this->config->vision)
+            ->fetch();
+
         if(!$doc) return false;
         if(!$this->checkPrivDoc($doc))
         {
diff --git a/module/story/model.php b/module/story/model.php
index ced0c50d4e..a35f05e3d9 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -24,7 +24,10 @@ class storyModel extends model
      */
     public function getById($storyID, $version = 0, $setImgSize = false)
     {
-        $story = $this->dao->findById((int)$storyID)->from(TABLE_STORY)->fetch();
+        $story = $this->dao->select('*')->from(TABLE_STORY)
+            ->where('id')->eq($storyID)
+            ->andWhere('vision')->eq($this->config->vision)
+            ->fetch();
         if(!$story) return false;
         if(substr($story->closedDate, 0, 4) == '0000') $story->closedDate = '';
         if($version == 0) $version = $story->version;
diff --git a/module/task/model.php b/module/task/model.php
index cf3bbee362..82981fb1c9 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1980,6 +1980,7 @@ class taskModel extends model
             ->leftJoin(TABLE_USER)->alias('t3')
             ->on('t1.assignedTo = t3.account')
             ->where('t1.id')->eq((int)$taskID)
+            ->andWhere('t1.vision')->eq($this->config->vision)
             ->fetch();
         if(!$task) return false;