From bbfad24d205935b6999794b9169f5203cb895881 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 23 May 2024 10:56:58 +0900
Subject: [PATCH] =?UTF-8?q?2024-05-23=2010:55=20=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=EB=A1=9C=EA=B7=B8/=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EB=A5=BC=20=EC=A0=91=EC=86=8DID=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=ED=95=A0=EC=88=98=20=EC=9E=88=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sym/log/clg/EgovLoginLog_SQL_Tibero.xml   | 21 ++++++++++++++-----
 .../jsp/sym/log/clg/EgovLoginLogList.jsp      |  3 ++-
 .../jsp/sym/log/clg/NSelectWebLogList.jsp     |  3 ++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml
index 4bb0be08..05051151 100644
--- a/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/let/sym/log/clg/EgovLoginLog_SQL_Tibero.xml
@@ -263,6 +263,8 @@
 				 	( a.MENU_NM LIKE '%'||#searchKeyword#||'%'  
 				 		OR  
 				 		b.URL LIKE '%'||#searchKeyword#||'%' 
+				 		 OR  
+				 		 c.USER_ID LIKE '%'||#searchKeyword#||'%' 
 				 	)
                 </isEqual>
                 <isEqual prepend="AND" property="searchCondition" compareValue="1">
@@ -271,6 +273,9 @@
                  <isEqual prepend="AND" property="searchCondition" compareValue="2">
 				 	b.URL LIKE '%'||#searchKeyword#||'%'
                 </isEqual>
+                <isEqual prepend="AND" property="searchCondition" compareValue="3">
+				 	c.USER_ID LIKE '%'||#searchKeyword#||'%'
+                </isEqual>
             </isNotEmpty>
             
             <isNotEmpty property="searchStartDt">
@@ -364,13 +369,16 @@
 	        AND a.CONECT_ID != ''
 	        <isNotEmpty property="searchKeyword">
                 <isEqual prepend="AND" property="searchCondition" compareValue="">
-				 	( a.MENU_NM LIKE CONCAT('%' , #searchKeyword#, '%')  OR  a.URL LIKE CONCAT('%' , #searchKeyword#, '%') )
+				 	( a.MENU_NM LIKE '%'||#searchKeyword#||'%'  OR  a.URL LIKE '%'||#searchKeyword#||'%'  OR  c.USER_ID LIKE '%'||#searchKeyword#||'%' )
                 </isEqual>
                 <isEqual prepend="AND" property="searchCondition" compareValue="1">
-				 	a.MENU_NM LIKE CONCAT('%' , #searchKeyword#, '%')
+				 	a.MENU_NM LIKE '%'||#searchKeyword#||'%'
                 </isEqual>
                  <isEqual prepend="AND" property="searchCondition" compareValue="2">
-				 	a.URL LIKE CONCAT('%' , #searchKeyword#, '%')
+				 	a.URL LIKE '%'||#searchKeyword#||'%'
+                </isEqual>
+                <isEqual prepend="AND" property="searchCondition" compareValue="3">
+				 	c.USER_ID LIKE '%'||#searchKeyword#||'%'
                 </isEqual>
             </isNotEmpty>
 	</select>
@@ -404,13 +412,16 @@
 
 			<isNotEmpty property="searchKeyword">
                 <isEqual prepend="AND" property="searchCondition" compareValue="">
-				 	( a.MENU_NM LIKE '%'||#searchKeyword#||'%'  OR  a.URL LIKE '%'||#searchKeyword#||'%' )
+				 	( a.MENU_NM LIKE '%'||#searchKeyword#||'%'  OR  b.URL LIKE '%'||#searchKeyword#||'%'   OR  c.USER_ID LIKE '%'||#searchKeyword#||'%' )
                 </isEqual>
                 <isEqual prepend="AND" property="searchCondition" compareValue="1">
 				 	a.MENU_NM LIKE '%'||#searchKeyword#||'%'
                 </isEqual>
                  <isEqual prepend="AND" property="searchCondition" compareValue="2">
-				 	a.URL LIKE '%'||#searchKeyword#||'%'
+				 	b.URL LIKE '%'||#searchKeyword#||'%'
+                </isEqual>
+                <isEqual prepend="AND" property="searchCondition" compareValue="3">
+				 	c.USER_ID LIKE '%'||#searchKeyword#||'%'
                 </isEqual>
             </isNotEmpty>
             
diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp
index 50e2e75c..c40da26d 100644
--- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/EgovLoginLogList.jsp
@@ -142,6 +142,7 @@ function fncReset(thisObj){
 									<option value='' <c:if test="${searchVO.searchCondition == ''}">selected</c:if> >전체</option>
 						   			<option value='1' <c:if test="${searchVO.searchCondition == '1'}">selected</c:if>>메뉴명</option>
 						   			<option value='2' <c:if test="${searchVO.searchCondition == '2'}">selected</c:if>>URL</option>
+						   			<option value='3' <c:if test="${searchVO.searchCondition == '3'}">selected</c:if>>접속ID</option>
 								</select>
 								
 								<input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword}'/>" class="search_input" placeholder="검색어를 입력하세요">									
@@ -247,7 +248,7 @@ function fncReset(thisObj){
 						</tr>
 						</c:forEach>
 						<c:if test="${empty adminLogList}">
-		         			<tr><td colspan="10"><spring:message code="common.nodata.msg" /></td></tr>
+		         			<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
 		         		</c:if>
 					</tbody>
 					</table>
diff --git a/src/main/webapp/WEB-INF/jsp/sym/log/clg/NSelectWebLogList.jsp b/src/main/webapp/WEB-INF/jsp/sym/log/clg/NSelectWebLogList.jsp
index 1aff910e..776b1433 100644
--- a/src/main/webapp/WEB-INF/jsp/sym/log/clg/NSelectWebLogList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/sym/log/clg/NSelectWebLogList.jsp
@@ -76,7 +76,7 @@ function linkPage(pageNo){
 	if($('#searchConditionSite').length != 0){
 		frm.searchConditionSite.value = $('#searchConditionSite').val();	
 	}
-	frm.action = "<c:url value='/sym/log/clg/SelectLoginLogList.do'/>";
+	frm.action = "<c:url value='/sym/log/clg/NSelectWebLogList.do'/>";
 	frm.submit();
 }
     
@@ -125,6 +125,7 @@ function logListExcelDownload(){
 									<option value='' <c:if test="${searchVO.searchCondition == ''}">selected</c:if> >전체</option>
 						   			<option value='1' <c:if test="${searchVO.searchCondition == '1'}">selected</c:if>>메뉴명</option>
 						   			<option value='2' <c:if test="${searchVO.searchCondition == '2'}">selected</c:if>>URL</option>
+						   			<option value='3' <c:if test="${searchVO.searchCondition == '3'}">selected</c:if>>접속ID</option>
 								</select>
 								
 								<input type="text" id="searchKeyword" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword}'/>" class="search_input" placeholder="검색어를 입력하세요">