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

* [task#123267,done,0.5h] fix get drill sql.

Browse Source
This commit is contained in:
zhouxin
2024-07-18 10:53:00 +08:00
committed by 綦新志
parent 8e7750e8dc
commit a8d88d30a4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/model.php
+9 -2
View File
@@ -2562,9 +2562,16 @@ class pivotModel extends model
$table = $this->config->db->prefix . $objectTable;
$fieldList = '';
foreach($conditions as $condition) $fieldList .= "{$condition['drillAlias']}.{$condition['drillField']},";
foreach($conditions as $condition)
{
if(!empty($condition['drillAlias']) && $condition['drillAlias'] != 't1')
{
$fieldAlias = "{$condition['drillAlias']}{$condition['drillField']}";
$fieldList .= "{$condition['drillAlias']}.{$condition['drillField']} AS $fieldAlias,";
}
}
$fieldList = rtrim($fieldList, ',');
$referSQL = empty($conditions) ? "SELECT t1.* FROM $table AS t1" : "SELECT t1.*, {$fieldList} FROM $table AS t1";
$referSQL = empty($fieldList) ? "SELECT t1.* FROM $table AS t1" : "SELECT t1.*, {$fieldList} FROM $table AS t1";
$drillSQL = $referSQL . " $whereSQL";
if(!empty($conditionsSQL)) $drillSQL = "SELECT t1.* FROM ($drillSQL) AS t1 {$conditionsSQL}";