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; }