Merge pull request 'dev' (#318) from dev into dev-deploy

Reviewed-on: #318

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

src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java

@@ -308,4 +308,7 @@ public class EstimateResponse {
   @Schema(description = "영업점 Fax번호")
   private String salesOfficeFax;
   
+  @Schema(description = "작성자 판매점 ID")
+  private String createSaleStoreId;
+
 }