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

Merge branch ztflow-wangyuting-dev/task-143677#wangyuting of zentao/zentaopms (#8934)

Browse Source
This commit is contained in:
刘刚
2025-05-27 16:10:15 +08:00
committed by Gitfox
parent 9923246342 8bef548465
commit 3625e8a190
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/dao/dao.class.php
+4 -4
View File
@@ -898,7 +898,7 @@ class baseDAO
$alias = preg_match("/`$table`\s+as\s+(\w+)/i", $sql, $matches) ? $matches[1] : '';
$replace = $alias ? "wHeRe $alias.`isTpl` = '0' AND" : "wHeRe `isTpl` = '0' AND";
$sql = str_ireplace("wHeRe", $replace, $sql);
$sql = preg_replace("/wHeRE/i", $replace, $sql, 1);
}
else
{
@@ -911,7 +911,7 @@ class baseDAO
{
$alias = preg_match("/`$table`\s+as\s+(\w+)/i", $sql, $mainMatches) ? $mainMatches[1] : '';
$replace = $alias ? "wHeRe $alias.`isTpl` = '0' AND" : "wHeRe `isTpl` = '0' AND";
$sql = str_ireplace("wHeRe", $replace, $sql);
$sql = preg_replace("/wHeRE/i", $replace, $sql, 1);
}
foreach($matches[1] as $index => $subSQL)
@@ -919,8 +919,8 @@ class baseDAO
if(strpos($sql, "`$table`") !== false && !preg_match("/`isTpl`\s*=\s*('1'|1)/", $subSQL))
{
$alias = preg_match("/`$table`\s+as\s+(\w+)/i", $subSQL, $subMatches) ? $subMatches[1] : '';
$replace = $alias ? "wHeRe $alias.`isTpl` = '0' AND" : "wHeRe `isTpl` = '0' AND";
$subSQL = str_ireplace("wHeRe", $replace, $subSQL);
$replace = $alias ? "wHeRe $alias.`isTpl` = '0' AND" : "wHeRe isTpl = '0' AND";
$subSQL = preg_replace("/wHeRE/i", $replace, $subSQL, 1);
}
$sql = str_ireplace("$$index", $subSQL, $sql);
}