Fix #2024 missing status list check in getNoticeList()

This commit is contained in:
Kijin Sung 2022-11-28 01:11:20 +09:00
parent 1312155aba
commit 221fa3daf8
2 changed files with 10 additions and 6 deletions

View file

@ -304,6 +304,7 @@ class documentModel extends document
$args = new stdClass(); $args = new stdClass();
$args->module_srl = $obj->module_srl; $args->module_srl = $obj->module_srl;
$args->category_srl = $obj->category_srl ?? null; $args->category_srl = $obj->category_srl ?? null;
$args->statusList = isset($obj->statusList) ? $obj->statusList : array(self::getConfigStatus('public'), self::getConfigStatus('secret'));
// Call trigger (before) // Call trigger (before)
// This trigger can be used to set an alternative output using a different search method // This trigger can be used to set an alternative output using a different search method

View file

@ -6,12 +6,15 @@
<column name="*" /> <column name="*" />
</columns> </columns>
<conditions> <conditions>
<group> <group>
<condition operation="in" column="module_srl" var="module_srl" filter="number" /> <group>
<condition operation="equal" column="category_srl" var="category_srl" pipe="and" /> <condition operation="in" column="module_srl" var="module_srl" filter="number" />
<condition operation="equal" column="is_notice" default="Y" pipe="and" /> <condition operation="equal" column="category_srl" var="category_srl" pipe="and" />
</group> <condition operation="equal" column="is_notice" default="Y" pipe="and" />
<condition operation="equal" column="is_notice" default="A" pipe="or" /> </group>
<condition operation="equal" column="is_notice" default="A" pipe="or" />
</group>
<condition operation="in" column="status" var="statusList" pipe="and" />
</conditions> </conditions>
<navigation> <navigation>
<index var="sort_index" default="list_order" order="asc" /> <index var="sort_index" default="list_order" order="asc" />