From 23e111d8df05c65c46add72dcbb4471fe93a5612 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 19 Jun 2024 13:34:13 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD:=20=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=BD=94=EB=93=9C=20=ED=8F=AC=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/base/code/web/CodeController.java   |  6 +++---
 src/main/resources/sql/mapper/code-mapper.xml    | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/cokr/xit/base/code/web/CodeController.java b/src/main/java/cokr/xit/base/code/web/CodeController.java
index 3852f4c..361b8a1 100644
--- a/src/main/java/cokr/xit/base/code/web/CodeController.java
+++ b/src/main/java/cokr/xit/base/code/web/CodeController.java
@@ -52,7 +52,7 @@ public class CodeController extends AbstractController {
 		setFetchSize(req);
 		return setCollectionInfo(
 			new ModelAndView("jsonView"),
-			codeService.getCategoryList(req),
+			codeService.getCategoryList(req.setIncludeAll(true)),
 			"category"
 		);
 	}
@@ -132,7 +132,7 @@ public class CodeController extends AbstractController {
 		setFetchSize(req);
 		return setCollectionInfo(
 			new ModelAndView("jsonView"),
-			codeService.getGroupList(req),
+			codeService.getGroupList(req.setIncludeAll(true)),
 			"group"
 		);
 	}
@@ -229,7 +229,7 @@ public class CodeController extends AbstractController {
 		setFetchSize(req);
 		return setCollectionInfo(
 			new ModelAndView("jsonView"),
-			codeService.getCodeList(req),
+			codeService.getCodeList(req.setIncludeAll(true)),
 			"code"
 		);
 	}
diff --git a/src/main/resources/sql/mapper/code-mapper.xml b/src/main/resources/sql/mapper/code-mapper.xml
index be27d2b..3934e28 100644
--- a/src/main/resources/sql/mapper/code-mapper.xml
+++ b/src/main/resources/sql/mapper/code-mapper.xml
@@ -44,8 +44,8 @@
 <sql id="selectCategories"><include refid="utility.paging-prefix" />
 SELECT *
   FROM TB_CODE_CTGR
- WHERE USE_YN = 'Y'
-<if test="categoryIDs != null">  AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if>
+<where><if test="!includeAll"> AND USE_YN = 'Y'</if>
+<if test="categoryIDs != null">  AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></sql>
 
@@ -94,9 +94,9 @@ UPDATE TB_CODE_CTGR SET
 <sql id="selectGroups"><include refid="utility.paging-prefix" />
 SELECT *
   FROM TB_CODE_GRP
- WHERE USE_YN = 'Y'
-<if test="categoryIDs != null">AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if>
-<if test="groupIDs != null">AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
+<where><if test="!includeAll"> AND USE_YN = 'Y'</if>
+<if test="categoryIDs != null"> AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if>
+<if test="groupIDs != null"> AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></sql>
 
@@ -151,9 +151,9 @@ UPDATE TB_CODE_GRP SET
 <sql id="selectCodes"><include refid="utility.paging-prefix" />
 SELECT *
   FROM TB_CMN_CODE
- WHERE USE_YN = 'Y'
-  <if test='groupIDs != null'>AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
-  <if test='codes != null'>AND CODE IN (<foreach collection="codes" item="code" separator=",">#{code}</foreach>)</if>
+<where><if test="!includeAll"> AND USE_YN = 'Y'</if>
+  <if test='groupIDs != null'> AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
+  <if test='codes != null'> AND CODE IN (<foreach collection="codes" item="code" separator=",">#{code}</foreach>)</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></sql>