From a7dac2ce15ae0c62edf3a4d4ce2a6822f3075848 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Tue, 18 Jul 2023 10:54:36 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20mergeQueryColumn=EC=97=90=EC=84=9C=20que?= =?UTF-8?q?ry=20=EA=B3=84=EC=82=B0=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20-=20=EC=9A=94=EC=B2=AD=20=EC=BF=BC=EB=A6=AC=20=3D?= =?UTF-8?q?=20queryMode=20+=20reqColumn=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20-?= =?UTF-8?q?=20=EA=B8=B0=EC=A1=B4=EC=97=90=EB=8A=94=20null=EC=9D=BC=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EC=97=90=EB=A7=8C=20queryMode=20=EC=A0=84?= =?UTF-8?q?=EC=B2=B4,=20null=EC=9D=B4=20=EC=95=84=EB=8B=88=EB=A9=B4=20quer?= =?UTF-8?q?yMode=EB=A5=BC=20=ED=95=9C=20=EB=8B=A8=EA=B3=84=20=EB=82=AE?= =?UTF-8?q?=EC=B6=94=EA=B3=A0,=20=20=20=20reqColumn=EC=9D=84=20=EB=8D=94?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=ED=98=95=ED=83=9C=EC=98=80=EC=9D=8C=20-?= =?UTF-8?q?=20=EC=A7=80=EB=82=9C=20=EB=B2=84=EA=B7=B8=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=ED=98=BC=EB=8F=99=EC=9D=84=20=EC=9D=BC=EC=9C=BC=ED=82=A4?= =?UTF-8?q?=EB=8A=94=20=EC=9A=94=EC=86=8C=EC=98=80=EC=9C=BC=EB=AF=80?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/General.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index ec5a342e..22be770d 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -1099,11 +1099,12 @@ class General implements iAction switch ($queryMode) { case GeneralQueryMode::Core: - case GeneralQueryMode::Lite: return [array_unique(array_merge($minimumColumn, $subColumn)), $rankColumn, $accessLogColumn]; + case GeneralQueryMode::Lite: + return [array_unique(array_merge($defaultEventColumn, $subColumn)), $rankColumn, $accessLogColumn]; case GeneralQueryMode::FullWithoutIAction: case GeneralQueryMode::Full: - return [array_unique(array_merge($defaultEventColumn, $subColumn)), $rankColumn, $accessLogColumn]; + return [array_unique(array_merge($fullColumn, $subColumn)), $rankColumn, $accessLogColumn]; case GeneralQueryMode::FullWithAccessLog: return [array_unique(array_merge($fullColumn, $subColumn)), $rankColumn, array_unique(array_merge($fullAcessLogColumn, $accessLogColumn))]; default: