From c145c466124bc2cde6c28105d4a04eb6368b504f Mon Sep 17 00:00:00 2001
From: "LAPTOP-L3VE7KK2\\USER" <jungpyo2001@interplug.co.kr>
Date: Mon, 3 Feb 2025 14:59:38 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=BC=EA=B1=B4=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/object/ObjectService.java       |  5 ++++
 .../resources/mappers/object/objectMapper.xml | 29 ++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
index 87bfaa4a..13452755 100644
--- a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
+++ b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java
@@ -173,6 +173,11 @@ public class ObjectService {
    * @throws Exception
    */
   public List<ObjectResponse> selectObjectList(ObjectRequest objectRequest) throws Exception {
+
+    if (!"T01".equals(objectRequest.getSaleStoreId())) {
+      objectRequest.setSchSelSaleStoreId("");
+    }
+
     return objectMapper.selectObjectList(objectRequest);
   }
 
diff --git a/src/main/resources/mappers/object/objectMapper.xml b/src/main/resources/mappers/object/objectMapper.xml
index 12318176..b7f1c308 100644
--- a/src/main/resources/mappers/object/objectMapper.xml
+++ b/src/main/resources/mappers/object/objectMapper.xml
@@ -141,7 +141,7 @@
     <select id="selectObjectList" parameterType="com.interplug.qcast.biz.object.dto.ObjectRequest" resultType="com.interplug.qcast.biz.object.dto.ObjectResponse">
         /* sqlid : com.interplug.qcast.biz.object.selectObjectList */
 
-        <if test='saleStoreId != null and saleStoreId != "T01"'>
+        <if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'>
         /* 계층형 구조에 맞는 SALE_STORE_ID 축출 - 재귀함수 */
         WITH SALES_STORE_CTE AS (
             SELECT
@@ -151,7 +151,14 @@
             FROM M_SALES_STORE WITH(NOLOCK)
             WHERE APPROVE_FLG  = '2'
                 AND DEL_FLG = '0'
-                AND SALE_STORE_ID = #{saleStoreId}
+                <choose>
+                    <when test='schSelSaleStoreId != null and schSelSaleStoreId != ""'>
+                    AND SALE_STORE_ID = #{schSelSaleStoreId}
+                    </when>
+                    <otherwise>
+                    AND SALE_STORE_ID = #{saleStoreId}
+                    </otherwise>
+                </choose>
 
             UNION ALL
             SELECT
@@ -209,7 +216,7 @@
             FROM T_OBJECT O WITH (NOLOCK)
             INNER JOIN M_SALES_STORE S WITH (NOLOCK)
                 ON O.SALE_STORE_ID = S.SALE_STORE_ID
-            <if test='saleStoreId != null and saleStoreId != "T01"'>
+            <if test='(saleStoreId != null and saleStoreId != "T01") or (schSelSaleStoreId != null and schSelSaleStoreId != "")'>
             INNER JOIN SALES_STORE_CTE T
                 ON S.SALE_STORE_ID = T.SALE_STORE_ID
             </if>
@@ -220,18 +227,12 @@
                 AND O.TEMP_FLG = '0'
             </if>
             <if test='schSaleStoreId != null and schSaleStoreId != ""'>
-                AND O.SALE_STORE_ID LIKE '%' + #{schSaleStoreId} + '%'
+                AND O.SALE_STORE_ID = #{schSaleStoreId}
+            </if>
+            <if test='schOtherSelSaleStoreId != null and schOtherSelSaleStoreId != ""'>
+                /* 2차점까지 고름 */
+                AND O.SALE_STORE_ID = #{schOtherSelSaleStoreId}
             </if>
-            <choose>
-                <when test='schOtherSelSaleStoreId != null and schOtherSelSaleStoreId != ""'>
-                    /* 2차점까지 고름 */
-                    AND O.SALE_STORE_ID = #{schOtherSelSaleStoreId}
-                </when>
-                <when test='schSelSaleStoreId != null and schSelSaleStoreId != ""'>
-                    /* 1차점까지만 고름 */
-                    AND O.SALE_STORE_ID = #{schSelSaleStoreId}
-                </when>
-            </choose>
             <if test='schAddress != null and schAddress != ""'>
                 AND O.ADDRESS LIKE '%' + #{schAddress} + '%'
             </if>