Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch release/21.7.6 of zentao/zentaopms (#11921)

Browse Source
This commit is contained in:
刘刚
2025-10-17 17:03:34 +08:00
committed by Gitfox
parent 3dcf2543a3 d39dc80e48
commit 5d0ef719e7
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update21.7.5.sql
+2
View File
@@ -26,3 +26,5 @@ REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `
('all', 'weekly', 'categoryList', 'week', '周报', '1', 'rnd'),
('all', 'weekly', 'categoryList', 'day', '日报', '1', 'rnd'),
('all', 'weekly', 'categoryList', 'milestone','里程碑报告', '1', 'rnd');
ALTER TABLE `zt_doc` CHANGE `lib` `lib` mediumint(8) unsigned NOT NULL DEFAULT '0';
db/zentao.sql
+1 -1
View File
@@ -806,7 +806,7 @@ CREATE TABLE IF NOT EXISTS `zt_doc` (
`project` mediumint(8) unsigned NOT NULL DEFAULT '0',
`product` mediumint(8) unsigned NOT NULL DEFAULT '0',
`execution` mediumint(8) unsigned NOT NULL DEFAULT '0',
`lib` varchar(30) NOT NULL DEFAULT '',
`lib` mediumint(8) unsigned NOT NULL DEFAULT '0',
`template` varchar(30) NOT NULL DEFAULT '',
`templateType` varchar(30) NOT NULL DEFAULT '',
`templateDesc` text NULL,
module/doc/model.php
+4 -4
View File
@@ -999,7 +999,7 @@ class docModel extends model
->leftJoin(TABLE_DOCLIB)->alias('t3')->on("t1.lib=t3.id")
->where('t1.deleted')->eq(0)
->andWhere('t1.templateType')->eq('')
->andWhere('t1.lib')->ne('')
->andWhere('t1.lib')->ne(0)
->andWhere('t1.type')->in($this->config->doc->docTypes)
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t2.id')->subIn($docSQL)
@@ -1023,7 +1023,7 @@ class docModel extends model
$docIdList = $type == 'editedby' ? $this->docTao->getEditedDocIdList() : array();
$docs = $this->dao->select('t1.*,t2.name as libName,t2.type as objectType')->from(TABLE_DOC)->alias('t1')->leftJoin(TABLE_DOCLIB)->alias('t2')->on("t1.lib=t2.id")
->where('t1.deleted')->eq(0)
->andWhere('t1.lib')->ne('')
->andWhere('t1.lib')->ne(0)
->andWhere('t1.templateType')->eq('')
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.type')->in($this->config->doc->docTypes)
@@ -2858,7 +2858,7 @@ class docModel extends model
->andWhere('t1.action')->eq('edited')
->andWhere('t1.actor')->eq($this->app->user->account)
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t2.lib')->ne('')
->andWhere('t2.lib')->ne(0)
->andWhere('t2.deleted')->eq(0)
->andWhere('t2.type')->in($this->config->doc->docTypes)
->fetch('count');
@@ -2869,7 +2869,7 @@ class docModel extends model
->andWhere('templateType')->eq('')
->andWhere('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->andWhere('lib')->ne('')
->andWhere('lib')->ne(0)
->fetch();
$statistic->myDocs = $myStatistic->myDocs;
module/doc/tao.php
+3 -3
View File
@@ -145,7 +145,7 @@ class docTao extends docModel
return $this->dao->select('t1.*, t2.name as libName, t2.type as objectType')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_DOCLIB)->alias('t2')->on("t1.lib=t2.id")
->where('t1.deleted')->eq(0)
->andWhere('t1.lib')->ne('')
->andWhere('t1.lib')->ne(0)
->andWhere('t1.id')->in($hasPrivDocIdList)
->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
->andWhere('t1.addedBy')->eq($this->app->user->account)
@@ -178,7 +178,7 @@ class docTao extends docModel
->leftJoin(TABLE_DOCLIB)->alias('t2')->on("t1.lib=t2.id")
->where('t1.deleted')->eq(0)
->andWhere('t1.id')->in(array_keys($docIdList))
->andWhere('t1.lib')->ne('')
->andWhere('t1.lib')->ne(0)
->andWhere('t1.vision')->in($this->config->vision)
->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
->orderBy($sort)
@@ -225,7 +225,7 @@ class docTao extends docModel
return $this->dao->select('t1.*')->from(TABLE_DOC)->alias('t1')
->leftJoin(TABLE_DOCACTION)->alias('t2')->on("t1.id=t2.doc && t2.action='collect'")
->where('t1.deleted')->eq(0)
->andWhere('t1.lib')->ne('')
->andWhere('t1.lib')->ne(0)
->andWhere('t1.templateType')->eq('')
->andWhere('t1.id')->in($hasPrivDocIdList)
->beginIF($this->config->doc->notArticleType)->andWhere('t1.type')->notIN($this->config->doc->notArticleType)->fi()
module/project/ui/create.field.php
+1
View File
@@ -52,6 +52,7 @@ $fields->field('days')
$fields->field('productsBox')->hidden(data('copyProject') && data('copyProject.hasProduct') == 0);
$fields->field('desc')->value(data('copyProject.desc'));
$fields->field('PM')->value(data('copyProject.PM'));
$fields->field('budget')->value(data('copyProject.budget'));
module/upgrade/model.php
+1 -1
View File
@@ -10996,7 +10996,7 @@ class upgradeModel extends model
->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t1.id = t2.doc && t1.version = t2.version')
->where('t1.deleted')->eq(0)
->andWhere('t1.templateType')->ne('')
->andWhere('t1.lib')->eq('')
->andWhere('t1.lib')->eq(0)
->andWhere('t1.module')->eq('')
->fetchAll('id', false);
if(empty($templateList)) return array();