Compare commits

..

No commits in common. "4ec934438b469fb802efe40def49c74e5b0e1ad0" and "6aa189e337a3929f26f238de662d999675c6a0c7" have entirely different histories.

2 changed files with 4 additions and 7 deletions

View File

@ -1667,8 +1667,8 @@ public class EstimateService {
String userId = estimateRequest.getUserId();
String storeLvl = estimateRequest.getStoreLvl();
String createStoreId = estimateRequest.getCreateStoreId();
if(storeLvl != null && !storeLvl.equals("1")){
if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
if(storeLvl != null && storeLvl.equals("2")){
if(!Objects.equals(createStoreId, 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("1")){
if(!Objects.equals(estimateResponse.getCreateSaleStoreId(), userId))
if(storeLvl != null && storeLvl.equals("2")){
if(!Objects.equals(createStoreId, userId))
excelTemplateNam = "excel_download_quotation_detail_template2.xlsx";
}

View File

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