Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/mjon_git
This commit is contained in:
commit
a2ac1fdfa1
@ -1798,6 +1798,14 @@ public class MjonMsgController {
|
||||
searchVO.setSearchSortAuthYN("Y");
|
||||
}
|
||||
|
||||
|
||||
if("N".equals(searchVO.getSearchCondition2())) {
|
||||
searchVO.setPhmType("03"); //거부조회
|
||||
}else {
|
||||
searchVO.setPhmType("01"); //발신조회
|
||||
}
|
||||
|
||||
|
||||
if(pattern.equals("/uss/ion/msg/SendNumberList.do") || pattern.equals("/web/msg/SendNumberList.do")) {
|
||||
// searchVO.setPhmType("01"); //발신조회
|
||||
}else {
|
||||
|
||||
@ -1682,7 +1682,9 @@
|
||||
</isEqual>
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchCondition2">
|
||||
<isNotEqual property="searchCondition2" compareValue="N">
|
||||
AND A.AUTH_YN = #searchCondition2# /** 인증여부 */
|
||||
</isNotEqual>
|
||||
</isNotEmpty>
|
||||
<isNotEmpty property="searchCondition3">
|
||||
AND A.PHM_AUTH_TYPE = #searchCondition3#
|
||||
|
||||
@ -251,6 +251,7 @@ function fnSetCalMonth(val) {
|
||||
<option value="Y" <c:if test="${searchVO.searchCondition2 == 'Y'}">selected="selected"</c:if>>인증완료</option>
|
||||
<option value="H" <c:if test="${searchVO.searchCondition2 == 'H'}">selected="selected"</c:if>>인증요청</option>
|
||||
<option value="C" <c:if test="${searchVO.searchCondition2 == 'C'}">selected="selected"</c:if>>반려</option>
|
||||
<option value="N" <c:if test="${searchVO.searchCondition2 == 'N'}">selected="selected"</c:if>>발신번호 차단</option>
|
||||
</select>
|
||||
<ec:select codeId="ITN027" name="searchCondition3" id="searchCondition3" css="class='select'" selectedValue="${searchVO.searchCondition3}" defaultValue="" defaultText="인증타입(전체)" />
|
||||
<select name="searchCondition" class="select" title="검색조건 선택">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user