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

Reviewed-on: #239

src/main/resources/config/application-dev.yml

@@ -26,7 +26,7 @@ spring:
   profiles:
     scheduler: N
 #QSP url 하나시스운영 #https://jp.qsalesplatform.com
-#QSP url 하나시스개발 #https://121.168.9.37:8080
+#QSP url 하나시스개발 #http://121.168.9.37:8080
 #QSP url interplug dev #http://1.248.227.176:8120
 qsp:
   url: http://121.168.9.37:8080

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -94,11 +94,11 @@
         SELECT
               T.*
             , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
-            , CASE WHEN SS2.DISP_COMPANY_NAME IS NOT NULL THEN SS2.DISP_COMPANY_NAME ELSE SS2.SALE_STORE_NAME END AS SALE_STORE_NAME
-            , CASE WHEN SS2.DISP_ZIP_NO IS NOT NULL THEN SS2.DISP_ZIP_NO ELSE SS2.ZIP_NO END AS ZIP_NO
-            , CASE WHEN SS2.DISP_ADDRESS IS NOT NULL THEN SS2.DISP_ADDRESS ELSE SS2.ADDRESS END AS ADDRESS
-            , CASE WHEN SS2.DISP_TEL IS NOT NULL THEN SS2.DISP_TEL ELSE SS2.TEL END AS TEL
-            , CASE WHEN SS2.DISP_FAX IS NOT NULL THEN SS2.DISP_FAX ELSE SS2.FAX END AS FAX
+            , 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
             , SSI2.BIZ_NO
         FROM
         (