Merge branch 'jsp'
This commit is contained in:
commit
710fafb0ed
@ -342,6 +342,8 @@
|
||||
, M.picture2Price
|
||||
, M.picture3Price
|
||||
, M.hotlineAgentCode
|
||||
, M.blineCode
|
||||
, M.recommendId
|
||||
, M.eventStatus
|
||||
, (
|
||||
SELECT MAX(MBER_LOG_DATE)
|
||||
@ -372,8 +374,6 @@
|
||||
, prePaymentYn
|
||||
, smishingYn
|
||||
, vipYn
|
||||
, blineCode
|
||||
, recommendId
|
||||
, DATE_FORMAT(sbscrbDe, '%Y-%m-%d %H:%i') sbscrbDe
|
||||
, DATE_FORMAT(expirePnttm, '%Y-%m-%d %H:%i') expirePnttm
|
||||
, DATE_FORMAT(mberSttusUptPnttm, '%Y-%m-%d %H:%i') mberSttusUptPnttm
|
||||
@ -390,6 +390,8 @@
|
||||
, picture2Price
|
||||
, picture3Price
|
||||
, hotlineAgentCode
|
||||
, blineCode
|
||||
, recommendId
|
||||
, EVNT.EVENT_STATUS AS eventStatus
|
||||
<isEqual property="mberSttus" compareValue="B">
|
||||
, SPAM.SMI_MEMO AS smiMemo
|
||||
@ -413,8 +415,6 @@
|
||||
, PRE_PAYMENT_YN prePaymentYn
|
||||
, SMISHING_YN smishingYn
|
||||
, VIP_YN vipYn
|
||||
, BLINE_CODE blineCode
|
||||
, RECOMMEND_ID recommendId
|
||||
, EXPIRE_PNTTM expirePnttm
|
||||
, MBER_STTUS_UPT_PNTTM mberSttusUptPnttm
|
||||
, ADMIN_SMS_NOTICE_YN AS adminSmsNoticeYn
|
||||
@ -425,6 +425,8 @@
|
||||
, PICTURE2_PRICE AS picture2Price
|
||||
, PICTURE3_PRICE AS picture3Price
|
||||
, HOTLINE_AGENT_CODE AS hotlineAgentCode
|
||||
, IFNULL(BLINE_CODE, 'N') AS blineCode
|
||||
, IFNULL(RECOMMEND_ID, '') AS recommendId
|
||||
FROM
|
||||
LETTNGNRLMBER
|
||||
) A
|
||||
|
||||
@ -388,7 +388,7 @@ function customLinkPage(mberId){
|
||||
<option value="Y" <c:if test="${userSearchVO.mberSttus == 'Y'}">selected="selected"</c:if> >일반(VIP포함)</option>
|
||||
<option value="B" <c:if test="${userSearchVO.mberSttus == 'B'}">selected="selected"</c:if> >이용 정지</option>
|
||||
<option value="V" <c:if test="${userSearchVO.mberSttus == 'V'}">selected="selected"</c:if> >VIP</option>
|
||||
<option value="BLINE" <c:if test="${userSearchVO.mberSttus == 'BLINE'}">selected="selected"</c:if> >BLINE</option>
|
||||
<option value="BLINE" <c:if test="${userSearchVO.mberSttus == 'BLINE'}">selected="selected"</c:if> >JJ B라인</option>
|
||||
<option value="VX" <c:if test="${userSearchVO.mberSttus == 'VX'}">selected="selected"</c:if> >일반(VIP제외)</option>
|
||||
</select>
|
||||
|
||||
@ -458,13 +458,13 @@ function customLinkPage(mberId){
|
||||
<colgroup>
|
||||
<col style="width: 3%">
|
||||
<col style="width: 5%">
|
||||
<col style="width: 9%">
|
||||
<col style="width: 9%">
|
||||
<col style="width: 10%">
|
||||
<col style="width: 8%">
|
||||
<col style="width: 7%">
|
||||
<col style="width: 8%">
|
||||
<col style="width: 9%">
|
||||
<col style="width: 6%">
|
||||
<col style="width: 6%">
|
||||
<col style="width: 6%">
|
||||
<col style="width: 5%">
|
||||
<col style="width: 6%">
|
||||
<col style="width: 8%">
|
||||
<col style="width: 8%">
|
||||
@ -512,7 +512,7 @@ function customLinkPage(mberId){
|
||||
<td <c:if test="${result.smishingYn eq 'Y'}">class="smishing"</c:if>>
|
||||
<%-- <a href="<c:url value='/uss/umt/user/EgovUserSelectUpdtView.do'/>?selectedId=<c:out value="${result.uniqId}"/>" onclick="javascript:fnSelectMber('<c:out value="${result.userTy}"/>:<c:out value="${result.uniqId}"/>'); return false;"> --%>
|
||||
<%-- <a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userTy}"/>', '<c:out value="${result.uniqId}"/>'); return false;"> --%>
|
||||
<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if>">
|
||||
<div class="id_box <c:if test='${result.vipYn eq "Y" }'>vip</c:if> <c:if test='${result.blineCode ne "N" }'>bMark</c:if>">
|
||||
<a href="#" onclick="javascript:fnSelectMber('<c:out value="${result.userId}"/>'); return false;">
|
||||
<span class="privateInfo"><c:out value="${result.userId}"/></span>
|
||||
</a>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user