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 @@
T1.MEM_NAME LIKE CONCAT('%' , #searchKeyword#, '%')
+
+ DECODE(T2.MEM_DEPT_NMS, NULL , '-', REPLACE(T2.MEM_DEPT_NMS, '부', '')) LIKE CONCAT('%' , #searchKeyword#, '%')
+
TO_CHAR(STR_TO_DATE(T1.MEM_TERM_EN, '%Y%m%d'),'YYYY') = #searchYear#