ISTCS-99 (접수자명 오류 수정요청)

src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -468,36 +468,22 @@
 		            ELSE 'N'
 		        END                                    AS CAN_REQUEST_CANCEL_YN
 		     , OC.NPAY_CHANGE_HOLD_YN
-		     , CASE WHEN OC.REG_NO = 0 THEN '비회원'
-		            WHEN OC.REG_NO = 99999 THEN '배치'
-		            WHEN OC.REG_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
-		                                                        ' / ',CUST_ID,
-		                                                        ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
-		                                          FROM   TB_CUSTOMER
-		                                          WHERE  CUST_NO = OC.REG_NO
-		                                         )
-		            ELSE (SELECT CONCAT(USER_NM,
-		                                ' / ',USER_ID,
-		                                ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
-		                  FROM   TB_USER
-		                  WHERE  USER_NO = OC.REG_NO
-		                 )
-		       END                                     AS REG_NM /*신청(접수)자정보*/
-		     , CASE WHEN OC.UPD_NO = 0 THEN '비회원'
-		            WHEN OC.UPD_NO = 99999 THEN '배치'
-		            WHEN OC.UPD_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
-		                                                        ' / ',CUST_ID,
-		                                                        ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
-		                                          FROM   TB_CUSTOMER
-		                                          WHERE  CUST_NO = OC.UPD_NO
-		                                         )
-		            ELSE (SELECT CONCAT(USER_NM,
-		                                ' / ',USER_ID,
-		                                ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
-		                  FROM   TB_USER
-		                  WHERE  USER_NO = OC.UPD_NO
-		                 )
-		       END                                     AS UPD_NM /*최종수정자정보*/
+		     , CONCAT(CASE WHEN OC.REG_NO = 0 THEN '비회원'
+					WHEN OC.REG_NO = 99999 THEN '배치'
+					ELSE (IFNULL((SELECT CONCAT(USER_NM,
+										' / ',USER_ID)
+						  FROM   TB_USER
+						  WHERE  USER_NO = OC.REG_NO AND (ROLE_CD='G001_0000' OR ROLE_CD LIKE 'G001_A3%')),'회원'
+						 ))
+			   END,' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S')) AS REG_NM /*신청(접수)자정보*/
+		     , CONCAT(CASE WHEN OC.UPD_NO = 0 THEN '비회원'
+					WHEN OC.UPD_NO = 99999 THEN '배치'
+					ELSE (IFNULL((SELECT CONCAT(USER_NM,
+										' / ',USER_ID)
+						  FROM   TB_USER
+						  WHERE  USER_NO = OC.UPD_NO AND (ROLE_CD='G001_0000' OR ROLE_CD LIKE 'G001_A3%')),'회원'
+						 ))
+			   END,' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S')) AS UPD_NM /*최종수정자정보*/
 		  FROM TB_ORDER_CHANGE_DETAIL OCD
 		 INNER JOIN TB_ORDER_CHANGE OC
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
@@ -4777,36 +4763,22 @@
 		         , RF.RF_CNCL_AMT
 		         , RF.RF_DELIVERY_FEE
 		         , RF.RF_REAL_CNCL_AMT
-		         , CASE WHEN OC.REG_NO = 0 THEN '비회원'
-		                WHEN OC.REG_NO = 99999 THEN '배치'
-		                WHEN OC.REG_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
-		                                                            ' / ',CUST_ID,
-		                                                            ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
-		                                              FROM   TB_CUSTOMER
-		                                              WHERE  CUST_NO = OC.REG_NO
-		                                             )
-		                ELSE (SELECT CONCAT(USER_NM,
-		                                    ' / ',USER_ID,
-		                                    ' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S'))
-		                      FROM   TB_USER
-		                      WHERE  USER_NO = OC.REG_NO
-		                     )
-		           END                                    AS REG_NM /*신청(접수)자정보*/
-		         , CASE WHEN OC.UPD_NO = 0 THEN '비회원'
-		                WHEN OC.UPD_NO = 99999 THEN '배치'
-		                WHEN OC.UPD_NO > 100000 THEN (SELECT CONCAT(FN_DEC_AES(CUST_NM),
-		                                                            ' / ',CUST_ID,
-		                                                            ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
-		                                              FROM   TB_CUSTOMER
-		                                              WHERE  CUST_NO = OC.UPD_NO
-		                                             )
-		                ELSE (SELECT CONCAT(USER_NM,
-		                                    ' / ',USER_ID,
-		                                    ' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S'))
-		                      FROM   TB_USER
-		                      WHERE  USER_NO = OC.UPD_NO
-		                     )
-		           END                                    AS UPD_NM /*최종수정자정보*/
+		         , CONCAT(CASE WHEN OC.REG_NO = 0 THEN '비회원'
+					WHEN OC.REG_NO = 99999 THEN '배치'
+					ELSE (IFNULL((SELECT CONCAT(USER_NM,
+										' / ',USER_ID)
+						  FROM   TB_USER
+						  WHERE  USER_NO = OC.REG_NO AND (ROLE_CD='G001_0000' OR ROLE_CD LIKE 'G001_A3%')),'회원'
+						 ))
+			   		END,' / ',DATE_FORMAT(OC.REG_DT,'%Y-%m-%d %H:%i:%S')) AS REG_NM /*신청(접수)자정보*/
+		     	 , CONCAT(CASE WHEN OC.UPD_NO = 0 THEN '비회원'
+					WHEN OC.UPD_NO = 99999 THEN '배치'
+					ELSE (IFNULL((SELECT CONCAT(USER_NM,
+										' / ',USER_ID)
+						  FROM   TB_USER
+						  WHERE  USER_NO = OC.UPD_NO AND (ROLE_CD='G001_0000' OR ROLE_CD LIKE 'G001_A3%')),'회원'
+						 ))
+			   		END,' / ',DATE_FORMAT(OC.UPD_DT,'%Y-%m-%d %H:%i:%S')) AS UPD_NM /*최종수정자정보*/
 		    FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
 		    INNER  JOIN TB_ORDER_DETAIL OD
 		    ON     ODIH.ORD_DTL_NO = OD.ORD_DTL_NO