Merge branch dev/bug-63423 of zentao/zentaopms (#9891)

This commit is contained in:
刘刚
2025-06-25 11:02:46 +08:00
committed by Gitfox
+2 -2
View File
@@ -1470,7 +1470,7 @@ class doc extends control
public function productSpace(int $objectID = 0, int $libID = 0, int $moduleID = 0, string $browseType = 'all', string $orderBy = '', int $param = 0, int $recTotal = 0, int $recPerPage = 20, int $pageID = 1, string $mode = '', int $docID = 0, string $search = '')
{
$noSpace = $this->app->tab != 'doc';
$mode = $noSpace ? 'list' : $mode;
$mode = empty($mode) && $noSpace ? 'list' : $mode;
echo $this->fetch('doc', 'app', "type=product&spaceID=$objectID&libID=$libID&moduleID=$moduleID&docID=$docID&mode=$mode&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&filterType=$browseType&search=$search&noSpace=$noSpace");
}
@@ -1493,7 +1493,7 @@ class doc extends control
public function projectSpace(int $objectID = 0, int $libID = 0, int $moduleID = 0, string $browseType = 'all', string $orderBy = '', int $param = 0, int $recTotal = 0, int $recPerPage = 20, int $pageID = 1, string $mode = '', int $docID = 0, string $search = '')
{
$noSpace = $this->app->tab != 'doc';
$mode = $noSpace ? 'list' : $mode;
$mode = empty($mode) && $noSpace ? 'list' : $mode;
echo $this->fetch('doc', 'app', "type=project&spaceID=$objectID&libID=$libID&moduleID=$moduleID&docID=$docID&mode=$mode&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&filterType=$browseType&search=$search&noSpace=$noSpace");
}