r7788 보완

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7789 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-04 06:41:01 +00:00
parent 4e0cc19d2b
commit 0a80f11235

View file

@ -799,14 +799,14 @@
if($output->order) { if($output->order) {
$conditions = $this->getConditionList($output); $conditions = $this->getConditionList($output);
if(in_array('list_order', $conditions) || in_array('update_order', $conditions)) { //if(in_array('list_order', $conditions) || in_array('update_order', $conditions)) {
foreach($output->order as $key => $val) { foreach($output->order as $key => $val) {
$col = $val[0]; $col = $val[0];
if(!in_array($col, array('list_order','update_order'))) continue; if(!in_array($col, array('list_order','update_order'))) continue;
if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col); if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
else $condition = sprintf(' where %s < 2100000000 ', $col); else $condition = sprintf(' where %s < 2100000000 ', $col);
} }
} //}
} }
$query = sprintf ("select %s from %s %s %s", $columns, $query = sprintf ("select %s from %s %s %s", $columns,
@ -1014,14 +1014,14 @@
if($output->order) { if($output->order) {
$conditions = $this->getConditionList($output); $conditions = $this->getConditionList($output);
if(in_array('list_order', $conditions) || in_array('update_order', $conditions)) { //if(in_array('list_order', $conditions) || in_array('update_order', $conditions)) {
foreach($output->order as $key => $val) { foreach($output->order as $key => $val) {
$col = $val[0]; $col = $val[0];
if(!in_array($col, array('list_order','update_order'))) continue; if(!in_array($col, array('list_order','update_order'))) continue;
if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col); if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
else $condition = sprintf(' where %s < 2100000000 ', $col); else $condition = sprintf(' where %s < 2100000000 ', $col);
} }
} //}
} }
$query = sprintf ("select %s from %s %s %s", $columns, $query = sprintf ("select %s from %s %s %s", $columns,