Merge branch 'card007' into develop

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -42,7 +42,7 @@
 						<!-- <button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or (recallExceptionInfo != null and (chgStat == 'G685_30' or chgStat == 'G685_31'))}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button> -->
 						<button type="button" class="btn btn-success" th:if="${chgStat == 'G685_20' or chgStat == 'G685_21' or (chgStat == 'G685_30' and (canRequestCancelYn == 'Y' or recallExceptionInfo != null)) or (chgStat == 'G685_31' and recallExceptionInfo != null)}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
 					</th:block>
-					<th:block th:i="${ordChgSq > 0 and (ordChgGb == 'G681_20' or ordChgGb == 'G681_40')}">
+					<th:block th:if="${ordChgSq > 0 and (ordChgGb == 'G681_20' or ordChgGb == 'G681_40')}">
 						<!-- 선발송 처리 시 교TO교 접수 불가 처리 -->
 						<button type="button" class="btn btn-success" th:unless="${ordChgGb == 'G681_20' and wdBfSendYn == 'Y'}" id="fnReturnToExchangeSubmit" onclick="fnExchange()">교환변경</button>
 					</th:block>
@@ -95,7 +95,7 @@
 				</table>
 				
 				<h4 class="chger">회수지 정보</h4>
-				<button style="float: right" type="button" class="btn btn-success" th:if="${#strings.isEmpty(ordChgGb) and ordChgSq > 0 and (chgStat == 'G685_20' or chgStat == 'G685_21')}" onclick="fnChangeChgerInfo();">회수지 수정</button>
+				<button style="float: right" type="button" class="btn btn-success" th:if="${#strings.isEmpty(ordChgGb) and ordChgSq > 0 and wdGb == 'W' and (chgStat == 'G685_20' or chgStat == 'G685_21')}" onclick="fnChangeChgerInfo();">회수지 수정</button>
 				<table class="frmStyle chger">
 					<colgroup>
 						<col style="width:160px;" />

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -72,10 +72,10 @@
 							<td th:text="${orderInfo[0].ordNm}"></td>
 							<td>
 								<th:block th:if="${orderInfo[0].custNo} > 0">
-									<a href="script:void(0)" class="custDetailPop" th:attr="custNo=${orderInfo[0].custNo}"><th:block th:text="${orderInfo[0].custNo}"></a>
+									<a href="script:void(0)" class="custDetailPop" th:attr="custNo=${orderInfo[0].custNo}"><th:block th:text="${orderInfo[0].custNo}"></th:block></a>
 								</th:block>
 								<th:block th:unless="${orderInfo[0].custNo} > 0">
-									<th:block th:text="${orderInfo[0].custNo}">
+									<th:block th:text="${orderInfo[0].custNo}"></th:block>
 								</th:block>
 							</td>
 							<td th:text="${orderInfo[0].ordNo}"></td>