mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-05 09:41:40 +09:00
Fix 1596 don't use cache for mid list if there are arguments
This commit is contained in:
parent
ca5d90fd07
commit
48c357a607
2 changed files with 19 additions and 16 deletions
|
|
@ -534,25 +534,29 @@ class moduleModel extends module
|
||||||
*/
|
*/
|
||||||
public static function getMidList($args = null, $columnList = array())
|
public static function getMidList($args = null, $columnList = array())
|
||||||
{
|
{
|
||||||
$list = Rhymix\Framework\Cache::get('site_and_module:module:mid_list');
|
// Remove site_srl.
|
||||||
|
if (is_object($args) && isset($args->site_srl))
|
||||||
|
{
|
||||||
|
unset($args->site_srl);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if there are any arguments.
|
||||||
|
$argsCount = $args === null ? 0 : countobj($args);
|
||||||
|
if(!$argsCount)
|
||||||
|
{
|
||||||
|
$columnList = array();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use cache only if there are no arguments. Otherwise, get data from DB.
|
||||||
|
$list = $argsCount ? null : Rhymix\Framework\Cache::get('site_and_module:module:mid_list');
|
||||||
if($list === null)
|
if($list === null)
|
||||||
{
|
{
|
||||||
if (is_object($args) && isset($args->site_srl))
|
$output = executeQueryArray('module.getMidList', $args, $columnList);
|
||||||
{
|
|
||||||
unset($args->site_srl);
|
|
||||||
}
|
|
||||||
|
|
||||||
$argsCount = countobj($args);
|
|
||||||
if(!$argsCount)
|
|
||||||
{
|
|
||||||
$columnList = array();
|
|
||||||
}
|
|
||||||
|
|
||||||
$output = executeQuery('module.getMidList', $args, $columnList);
|
|
||||||
if(!$output->toBool()) return $output;
|
if(!$output->toBool()) return $output;
|
||||||
$list = $output->data;
|
$list = $output->data;
|
||||||
|
|
||||||
if(!$argsCount && !$columnList)
|
// Set cache only if there are no arguments.
|
||||||
|
if(!$argsCount)
|
||||||
{
|
{
|
||||||
Rhymix\Framework\Cache::set('site_and_module:module:mid_list', $list, 0, true);
|
Rhymix\Framework\Cache::set('site_and_module:module:mid_list', $list, 0, true);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
<conditions>
|
<conditions>
|
||||||
<condition operation="equal" column="module_srl" var="module_srl" pipe="and" />
|
<condition operation="equal" column="module_srl" var="module_srl" pipe="and" />
|
||||||
<condition operation="in" column="module_srl" var="module_srls" pipe="and" />
|
<condition operation="in" column="module_srl" var="module_srls" pipe="and" />
|
||||||
<condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
|
|
||||||
<condition operation="equal" column="module" var="module" pipe="and" />
|
<condition operation="equal" column="module" var="module" pipe="and" />
|
||||||
<condition operation="equal" column="module_category_srl" var="module_category_srl" />
|
<condition operation="equal" column="module_category_srl" var="module_category_srl" />
|
||||||
</conditions>
|
</conditions>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue