tolag3/kcc_adr_advc_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 수정
This commit is contained in:
leejunho 2023-07-14 16:56:46 +09:00
parent 670c74cffc
commit 7db7ef7514
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcc/kccadr/adjPgrMgr/cclt/web/ConciliatorManageController.java
View File

@ -88,7 +88,7 @@ public class ConciliatorManageController {
conciliatorManageVO.setSearchSortOrd("desc"); conciliatorManageVO.setSearchSortOrd("desc");
} }
if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword())){ if(StringUtils.isNotBlank(conciliatorManageVO.getSearchKeyword()) && !"3".equals(conciliatorManageVO.getSearchCondition())){
conciliatorManageVO.setSearchKeyword(egovCryptoUtil.encrypt(conciliatorManageVO.getSearchKeyword())); conciliatorManageVO.setSearchKeyword(egovCryptoUtil.encrypt(conciliatorManageVO.getSearchKeyword()));
} }

3
src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cclt/ConciliatorManage_SQL_Mysql.xml
View File

@ -90,6 +90,9 @@
<isEqual prepend="AND" property="searchCondition" compareValue="2"> <isEqual prepend="AND" property="searchCondition" compareValue="2">
T1.MEM_NAME LIKE CONCAT('%' , #searchKeyword#, '%') T1.MEM_NAME LIKE CONCAT('%' , #searchKeyword#, '%')
</isEqual> </isEqual>
<isEqual prepend="AND" property="searchCondition" compareValue="3">
DECODE(T2.MEM_DEPT_NMS, NULL , '-', REPLACE(T2.MEM_DEPT_NMS, '부', '')) LIKE CONCAT('%' , #searchKeyword#, '%')
</isEqual>
</isNotEmpty> </isNotEmpty>
<isEqual prepend="AND" property="searchCondition2" compareValue="1"> <isEqual prepend="AND" property="searchCondition2" compareValue="1">
TO_CHAR(STR_TO_DATE(T1.MEM_TERM_EN, '%Y%m%d'),'YYYY') = #searchYear# TO_CHAR(STR_TO_DATE(T1.MEM_TERM_EN, '%Y%m%d'),'YYYY') = #searchYear#