diff --git a/src/main/java/com/interplug/qcast/biz/login/LoginService.java b/src/main/java/com/interplug/qcast/biz/login/LoginService.java
index 7798dd2a..c1c1b488 100644
--- a/src/main/java/com/interplug/qcast/biz/login/LoginService.java
+++ b/src/main/java/com/interplug/qcast/biz/login/LoginService.java
@@ -1,23 +1,24 @@
 package com.interplug.qcast.biz.login;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
-import org.springframework.stereotype.Service;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.interplug.qcast.biz.login.dto.JoinUser;
-import com.interplug.qcast.biz.login.dto.LoginUser;
-import com.interplug.qcast.biz.login.dto.UserLoginResponse;
-import com.interplug.qcast.biz.login.dto.UserPassword;
-import com.interplug.qcast.biz.login.dto.UserResponse;
-import com.interplug.qcast.config.Exception.ErrorCode;
-import com.interplug.qcast.config.Exception.QcastException;
-import com.interplug.qcast.config.message.Messages;
-import com.interplug.qcast.util.DefaultResponse;
-import com.interplug.qcast.util.InterfaceQsp;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Service;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.interplug.qcast.biz.login.dto.JoinUser;
+import com.interplug.qcast.biz.login.dto.LoginUser;
+import com.interplug.qcast.biz.login.dto.UserLoginResponse;
+import com.interplug.qcast.biz.login.dto.UserPassword;
+import com.interplug.qcast.biz.login.dto.UserResponse;
+import com.interplug.qcast.config.Exception.ErrorCode;
+import com.interplug.qcast.config.Exception.QcastException;
+import com.interplug.qcast.config.message.Messages;
+import com.interplug.qcast.util.DefaultResponse;
+import com.interplug.qcast.util.InterfaceQsp;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @Service
@@ -57,14 +58,20 @@ public class LoginService {
     // /api/user/login
     String strResponse =
         interfaceQsp.callApi(HttpMethod.POST, qspUrl + "/api/user/login", loginUser);
-    if (!"".equals(strResponse)) {
-      ObjectMapper om =
-          new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-      userLoginResponse = om.readValue(strResponse, UserLoginResponse.class);
-    }
-
-    return userLoginResponse;
-  }
+    if (!"".equals(strResponse)) {
+      ObjectMapper om =
+          new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+      userLoginResponse = om.readValue(strResponse, UserLoginResponse.class);
+    }
+
+    if (userLoginResponse != null
+        && userLoginResponse.getResult() != null
+        && "S".equalsIgnoreCase(userLoginResponse.getResult().getResultCode())) {
+      userLoginResponse.setSessionId(UUID.randomUUID().toString());
+    }
+
+    return userLoginResponse;
+  }
 
   public UserResponse getUser(LoginUser loginUser) {
     return loginMapper.getUser(loginUser);
diff --git a/src/main/java/com/interplug/qcast/biz/login/dto/UserLoginResponse.java b/src/main/java/com/interplug/qcast/biz/login/dto/UserLoginResponse.java
index 52cf8d1e..ca028099 100644
--- a/src/main/java/com/interplug/qcast/biz/login/dto/UserLoginResponse.java
+++ b/src/main/java/com/interplug/qcast/biz/login/dto/UserLoginResponse.java
@@ -8,4 +8,5 @@ import lombok.Setter;
 @Setter
 public class UserLoginResponse extends DefaultResponse {
   private UserResponse data;
+  private String sessionId;
 }
diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index afbc6180..14db6c75 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -91,15 +91,40 @@
 
     <select id="selectEstimatePdfDetail" parameterType="com.interplug.qcast.biz.estimate.dto.EstimateRequest" resultType="com.interplug.qcast.biz.estimate.dto.EstimateResponse">
         /* sqlid : com.interplug.qcast.biz.estimate.selectPdfEstimateDetail */
+
+        SELECT Z.*
+             , SS3.ZIP_NO AS ZIP_NO3
+             , SS3.ADDRESS AS ADDRESS3
+             , SS3.TEL AS TEL3
+             , SS3.FAX AS FAX3
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ZIP_NO2
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ZIP_NO
+                    ELSE Z.ZIP_NO1 END AS ZIP_NO
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.ADDRESS2
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.ADDRESS
+                    ELSE Z.ADDRESS1 END AS ADDRESS
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.TEL2
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.TEL
+                    ELSE Z.TEL1 END AS TEL
+             , CASE WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') = ''  THEN Z.FAX2
+                    WHEN Z.CREATE_USER = 'T01' AND ISNULL(Z.FIRST_AGENT_ID,'') != '' THEN SS3.FAX
+                    ELSE Z.FAX1 END AS FAX
+        FROM (
+
         SELECT
               T.*
             , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
             , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
-            , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO
-            , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS
-            , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL
-            , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX
+            , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO1
+            , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS1
+            , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL1
+            , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX1
             , SSI2.BIZ_NO
+            , SS1.ZIP_NO AS ZIP_NO2
+            , SS1.ADDRESS AS ADDRESS2
+            , SS1.TEL AS TEL2
+            , SS1.FAX AS FAX2
+            , SS1.FIRST_AGENT_ID
         FROM
         (
             SELECT
@@ -113,6 +138,7 @@
                 , PI.ESTIMATE_OPTION
                 , PI.PKG_ASP
                 , PI.REMARKS
+                , PI.CREATE_USER
                 , O.SALE_STORE_ID
                 , O.OBJECT_NAME
                 , O.OBJECT_NAME_OMIT
@@ -146,6 +172,9 @@
             ON T.CREATE_SALE_STORE_ID = SS2.SALE_STORE_ID
         LEFT OUTER JOIN M_SALES_STORE_INFO SSI2 WITH (NOLOCK)
             ON T.CREATE_SALE_STORE_ID = SSI2.SALE_STORE_ID
+        )Z
+        LEFT OUTER JOIN M_SALES_STORE SS3 WITH (NOLOCK)
+        ON Z.FIRST_AGENT_ID = SS3.SALE_STORE_ID
     </select>
 
     <select id="selectEstimateApiFailList" resultType="com.interplug.qcast.biz.estimate.dto.EstimateSendResponse">