이준호 전자조정시스템 고도화 커밋

- 수정

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()));
         }
         

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#