From 54471f06f99806e73227b53b1c9b99d579d9d393 Mon Sep 17 00:00:00 2001 From: jungpyo Date: Wed, 14 Jan 2026 13:11:58 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=9D=B4=EC=A0=95=ED=91=9C]=20=EA=B2=AC?= =?UTF-8?q?=EC=A0=81=EC=84=9C=202=EC=B0=A8=EC=A0=90=20=EA=B0=80=EA=B2=A9?= =?UTF-8?q?=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?(2=EC=B0=A8=EA=B0=80=20=EC=9E=91=EC=84=B1=ED=95=9C=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/interplug/qcast/biz/estimate/EstimateService.java | 8 ++++---- .../qcast/biz/estimate/dto/EstimateResponse.java | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index fd1dffd2..875b87b3 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1667,8 +1667,8 @@ public class EstimateService { String userId = estimateRequest.getUserId(); String storeLvl = estimateRequest.getStoreLvl(); String createStoreId = estimateRequest.getCreateStoreId(); - if(storeLvl != null && storeLvl.equals("2")){ - if(!Objects.equals(createStoreId, userId)) + if(storeLvl != null && !storeLvl.equals("1")){ + if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId)) templateFilePath = "pdf_download_quotation_detail_template2.html"; } @@ -1721,8 +1721,8 @@ public class EstimateService { String userId = estimateRequest.getUserId(); String storeLvl = estimateRequest.getStoreLvl(); String createStoreId = estimateRequest.getCreateStoreId(); - if(storeLvl != null && storeLvl.equals("2")){ - if(!Objects.equals(createStoreId, userId)) + if(storeLvl != null && !storeLvl.equals("1")){ + if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId)) excelTemplateNam = "excel_download_quotation_detail_template2.xlsx"; } diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java index 00c98510..56d442c1 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java @@ -307,5 +307,8 @@ public class EstimateResponse { @Schema(description = "영업점 Fax번호") private String salesOfficeFax; + + @Schema(description = "작성자 판매점 ID") + private String createSaleStoreId; }