From 7db7ef7514e70edb1b2208f099cb3f2c8227f82b Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Fri, 14 Jul 2023 16:56:46 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?=
 =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?=
 =?UTF-8?q?=EA=B3=A0=EB=8F=84=ED=99=94=20=EC=BB=A4=EB=B0=8B=20=20-=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java | 2 +-
 .../kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java
index cb81b6b0..6d6ce9ae 100644
--- a/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java
@@ -88,7 +88,7 @@ public class ConciliatorManageController {
             conciliatorManageVO.setSearchSortOrd("desc");
         }
 
-        if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){
+        if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword()) && !"3".equals(conciliatorManageVO.getSearchCondition())){
             conciliatorManageVO.setSearchKeyword(egovCryptoUtil.encrypt(conciliatorManageVO.getSearchKeyword()));
         }
         
diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
index 4552d77e..7ee44dc3 100644
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
@@ -90,6 +90,9 @@
 			<isEqual prepend="AND" property="searchCondition" compareValue="2">
 				T1.MEM_NAME LIKE CONCAT('%' , #searchKeyword#, '%')
 			</isEqual>
+			<isEqual prepend="AND" property="searchCondition" compareValue="3">
+				DECODE(T2.MEM_DEPT_NMS, NULL , '-', REPLACE(T2.MEM_DEPT_NMS, '부', '')) LIKE CONCAT('%' , #searchKeyword#, '%')
+			</isEqual>
 		</isNotEmpty>
 		<isEqual prepend="AND" property="searchCondition2" compareValue="1">
 			TO_CHAR(STR_TO_DATE(T1.MEM_TERM_EN, '%Y%m%d'),'YYYY') = #searchYear#