From a5fa727c95d941f785cc07213db6d68ce056e015 Mon Sep 17 00:00:00 2001
From: JIWOO <dlwldn1024@iten.co.kr>
Date: Wed, 15 Oct 2025 15:39:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20>=20=EA=B3=BC=EC=A0=95=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=20>=20=EA=B3=BC=EC=A0=95=EB=93=B1=EB=A1=9D=20>=20=EC=82=AC?=
 =?UTF-8?q?=EC=A7=84=20=EC=98=81=EC=97=AD=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trgtMng/web/CmdTrgtMngController.java     | 32 ++++++++++++++-----
 .../trgtMng/web/CndtnTrgtMngController.java   | 32 ++++++++++++++-----
 .../jsp/oprtn/cmdTrgt/cndtnEduPrcsMngReg.jsp  |  4 +--
 .../cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp     |  4 +--
 .../jsp/oprtn/prevent/cndtnEduPrcsMngReg.jsp  |  4 +--
 5 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java
index f1e48e20..bf1f5b12 100644
--- a/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cmdTrgtInfo/trgtMng/web/CmdTrgtMngController.java
@@ -224,7 +224,6 @@ public class CmdTrgtMngController {
     		
     		//selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
     		selectCondition += "AND	a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%'	";
-    		cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
     		
     	}
     	
@@ -2265,14 +2264,31 @@ public class CmdTrgtMngController {
 			//2. pageing step2
 			cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo);
 			
-			//검색 조회
-			String selectCondition = "";
-			if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
-				String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
-//				selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
-				selectCondition = "AND	a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'";
-				cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
+	    	//검색 조회
+	    	String selectCondition = "";
+	    	
+	    	if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
+	    		String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
+	    		
+	    		//selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+	    		selectCondition += "AND	a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%'	";
+	    		
+	    	}
+	    	
+			//성명검색
+			if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
+				//cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()));
+				selectCondition += "	AND	a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "'	";
+				//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 			}
+			
+			//생년월일검색		
+			if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){
+				selectCondition += "	AND	a.d_birth ='" + egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordTo()) + "'	";
+				
+			}
+			
+			cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 
 			if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus()))
 			{
diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
index 5e398096..32626aa2 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
@@ -219,7 +219,6 @@ public class CndtnTrgtMngController {
     		
     		//selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
     		selectCondition += "AND	a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%'	";
-    		cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
     		
     	}
     	
@@ -2259,14 +2258,31 @@ public class CndtnTrgtMngController {
 			//2. pageing step2
 			cndtnTrgtInfoMngVO = this.setCndtnPagingStep2(cndtnTrgtInfoMngVO, paginationInfo);
 			
-			//검색 조회
-			String selectCondition = "";
-			if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
-				String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
-//				selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
-				selectCondition = "AND	a."+searchStatus+" LIKE '%" +cndtnTrgtInfoMngVO.getSearchKeyword() + "%'";
-				cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
+	    	//검색 조회
+	    	String selectCondition = "";
+	    	
+	    	if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeyword())){
+	    		String searchStatus = cndtnTrgtInfoMngVO.getSearchStatus();
+	    		
+	    		//selectCondition = "AND	a."+searchStatus+" LIKE CONCAT ('%', '" +cndtnTrgtInfoMngVO.getSearchKeyword() + "', '%')";
+	    		selectCondition += "AND	a."+searchStatus+" LIKE '%'||'" +cndtnTrgtInfoMngVO.getSearchKeyword() + "'||'%'	";
+	    		
+	    	}
+	    	
+			//성명검색
+			if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordFrom())){
+				//cndtnTrgtInfoMngVO.setSearchKeywordFrom(egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()));
+				selectCondition += "	AND	a.trgt_nm = '" +egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordFrom()) + "'	";
+				//cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 			}
+			
+			//생년월일검색		
+			if(StringUtil.isNotEmpty(cndtnTrgtInfoMngVO.getSearchKeywordTo())){
+				selectCondition += "	AND	a.d_birth ='" + egovCryptoUtil.encrypt(cndtnTrgtInfoMngVO.getSearchKeywordTo()) + "'	";
+				
+			}
+			
+			cndtnTrgtInfoMngVO.setSearchQuery(selectCondition);
 
 			if(StringUtils.isNotEmpty(cndtnTrgtInfoMngVO.getSearchSelStatus()))
 			{
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsMngReg.jsp
index b3e9a4cb..8742c297 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsMngReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsMngReg.jsp
@@ -188,7 +188,7 @@
 									defaultText="선택"
 									/>
 <!-- 							<input type="text" name="instrNm"/> -->
-			                            <div class="put_photo">
+			                            <%-- <div class="put_photo">
 											<div class="put_photo_in">
 												<div class="put_photo_box">
 													<img id="emptyImg" src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
@@ -199,7 +199,7 @@
 												</div>
 											</div>
 												<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-										</div>
+										</div> --%>
 <%-- 							<ve:select codeId="VE0015" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="<c:out value='${info.prcsDiv}'/>" defaultValue='10'/>							 --%>
 						</td>
 					</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp
index 6a88ab53..7d8ba851 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp
@@ -188,7 +188,7 @@
 									defaultText="선택"
 									/>
 <!-- 							<input type="text" name="instrNm"/> -->
-			                            <div class="put_photo">
+			                            <%-- <div class="put_photo">
 											<div class="put_photo_in">
 												<div class="put_photo_box">
 													<img id="emptyImg" src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
@@ -199,7 +199,7 @@
 												</div>
 											</div>
 												<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-										</div>
+										</div> --%>
 <%-- 							<ve:select codeId="VE0015" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="<c:out value='${info.prcsDiv}'/>" defaultValue='10'/>							 --%>
 						</td>
 					</tr>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsMngReg.jsp
index af517af8..4e77e312 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsMngReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsMngReg.jsp
@@ -188,7 +188,7 @@
 									defaultText="선택"
 									/>
 <!-- 							<input type="text" name="instrNm"/> -->
-			                            <div class="put_photo">
+			                            <%-- <div class="put_photo">
 											<div class="put_photo_in">
 												<div class="put_photo_box">
 													<img id="emptyImg" src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
@@ -199,7 +199,7 @@
 												</div>
 											</div>
 												<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
-										</div>
+										</div> --%>
 <%-- 							<ve:select codeId="VE0015" name="prcsDiv" id="prcsDiv" css="class='sel_type1'" selectedValue="<c:out value='${info.prcsDiv}'/>" defaultValue='10'/>							 --%>
 						</td>
 					</tr>