diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index e8989cd4..b7699859 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -177,4 +177,10 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement mberManageDAO.updateMberCnf(vo); } + @Override + public void updateMberNm(MberManageVO mberManageVO) throws Exception { + mberManageDAO.updateMber(mberManageVO); + + + } } \ No newline at end of file diff --git a/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java b/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java index a423eef2..2ce4c510 100644 --- a/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java +++ b/src/main/java/kcc/let/uss/umt/service/EgovMberManageService.java @@ -128,5 +128,6 @@ public interface EgovMberManageService { */ public void updateMberCnf(MberManageConfigVO mberManageConfigVO) throws Exception; + public void updateMberNm(MberManageVO mberManageVO) throws Exception; } \ No newline at end of file diff --git a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java index 54867cd0..461702fe 100644 --- a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java @@ -73,6 +73,7 @@ import kcc.let.uss.umt.service.MberManageConfigVO; import kcc.let.uss.umt.service.MberManageVO; import kcc.let.uss.umt.service.UserDefaultVO; import kcc.let.uss.umt.service.UserManageVO; +import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.sim.service.EgovFileScrty; /** @@ -147,6 +148,12 @@ public class EgovUserManageController { @Resource(name = "loginService") private EgovLoginService loginService; + + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + private String topLocNo = "1000000" ; //전역 최상위 매뉴번호 @@ -187,43 +194,57 @@ public class EgovUserManageController { userSearchVO.setPageUnit(userSearchVO.getPageUnit()); } - /** pageing */ - PaginationInfo paginationInfo = new PaginationInfo(); - paginationInfo.setCurrentPageNo(userSearchVO.getPageIndex()); - paginationInfo.setRecordCountPerPage(userSearchVO.getPageUnit()); - paginationInfo.setPageSize(userSearchVO.getPageSize()); + try{ + /** pageing */ + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(userSearchVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(userSearchVO.getPageUnit()); + paginationInfo.setPageSize(userSearchVO.getPageSize()); - userSearchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); - userSearchVO.setLastIndex(paginationInfo.getLastRecordIndex()); - userSearchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); - LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - //userSearchVO.setAdminYn("Y"); - if("".equals(userSearchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - userSearchVO.setSearchSortCnd("uniqId"); - userSearchVO.setSearchSortOrd("desc"); + userSearchVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); + userSearchVO.setLastIndex(paginationInfo.getLastRecordIndex()); + userSearchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); + LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + //userSearchVO.setAdminYn("Y"); + if("".equals(userSearchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + userSearchVO.setSearchSortCnd("uniqId"); + userSearchVO.setSearchSortOrd("desc"); + } + List resultList = userManageService.selectUserList(userSearchVO) ; + model.addAttribute("resultList", resultList); + //paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0); + int i_resultList = resultList.size(); + + /* + if (i_resultList>0) { + String g_resultList = ((EgovMap)resultList.get(0)).get("totCnt").toString(); + } + */ + + //paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totCnt")) : 0); + paginationInfo.setTotalRecordCount(i_resultList); + model.addAttribute("paginationInfo", paginationInfo); + + //사용자상태코드를 코드정보로부터 조회 + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + vo.setCodeId("COM038"); + model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo));//사용자상태코드목록 + + //권한조회 + AuthorManageVO authorManageVO = new AuthorManageVO(); + authorManageVO.setFirstIndex(0); + authorManageVO.setLastIndex(10); + authorManageVO.setRecordCountPerPage(10); + authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO)); + model.addAttribute("authorList", authorManageVO.getAuthorManageList()); + + if("/uss/umt/user/EgovUserManageMenuAjax.do".equals(request.getServletPath())) { + return "cmm/uss/umt/EgovUserManageMenuAjax"; + } + }catch(Exception ex) { + ex.printStackTrace(); } - List resultList = userManageService.selectUserList(userSearchVO) ; - model.addAttribute("resultList", resultList); - //paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0); - paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totCnt")) : 0); - model.addAttribute("paginationInfo", paginationInfo); - - //사용자상태코드를 코드정보로부터 조회 - ComDefaultCodeVO vo = new ComDefaultCodeVO(); - vo.setCodeId("COM038"); - model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo));//사용자상태코드목록 - //권한조회 - AuthorManageVO authorManageVO = new AuthorManageVO(); - authorManageVO.setFirstIndex(0); - authorManageVO.setLastIndex(10); - authorManageVO.setRecordCountPerPage(10); - authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO)); - model.addAttribute("authorList", authorManageVO.getAuthorManageList()); - - if("/uss/umt/user/EgovUserManageMenuAjax.do".equals(request.getServletPath())) { - return "cmm/uss/umt/EgovUserManageMenuAjax"; - } return "cmm/uss/umt/EgovUserManage"; } @@ -262,7 +283,13 @@ public class EgovUserManageController { userSearchVO.setSearchSortCnd("uniqId"); userSearchVO.setSearchSortOrd("desc"); } + //이름 검색 암호화 + userSearchVO.setSnsSiteName(egovCryptoUtil.encrypt(userSearchVO.getSearchKeyword())); + List resultList = mberManageService.selectMberList(userSearchVO); + + //이름 복호화 + model.addAttribute("resultList", resultList); // paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((Long)((EgovMap)resultList.get(0)).get("totCnt")).intValue() : 0); paginationInfo.setTotalRecordCount(10); @@ -534,80 +561,86 @@ public class EgovUserManageController { return redirectUrlMaker.getRedirectUrl(); } - - ComDefaultCodeVO vo = new ComDefaultCodeVO(); - //패스워드힌트목록을 코드정보로부터 조회 - vo.setCodeId("COM022"); - model.addAttribute("passwordHint_result", cmmUseService.selectCmmCodeDetail(vo)); - //성별구분코드를 코드정보로부터 조회 - vo.setCodeId("COM014"); - model.addAttribute("sexdstnCode_result", cmmUseService.selectCmmCodeDetail(vo)); - //사용자상태코드를 코드정보로부터 조회 - vo.setCodeId("COM013"); - model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo)); - //소속기관코드를 코드정보로부터 조회 - COM025 - vo.setCodeId("COM025"); - model.addAttribute("insttCode_result", cmmUseService.selectCmmCodeDetail(vo)); - //조직정보를 조회 - ORGNZT_ID정보 - vo.setTableNm("LETTNORGNZTINFO"); - model.addAttribute("orgnztId_result", cmmUseService.selectOgrnztIdDetail(vo)); - //그룹정보를 조회 - GROUP_ID정보 - vo.setTableNm("LETTNORGNZTINFO"); - model.addAttribute("groupId_result", cmmUseService.selectGroupIdDetail(vo)); + try { + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + //패스워드힌트목록을 코드정보로부터 조회 + vo.setCodeId("COM022"); + model.addAttribute("passwordHint_result", cmmUseService.selectCmmCodeDetail(vo)); + //성별구분코드를 코드정보로부터 조회 + vo.setCodeId("COM014"); + model.addAttribute("sexdstnCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //사용자상태코드를 코드정보로부터 조회 + vo.setCodeId("COM013"); + model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //소속기관코드를 코드정보로부터 조회 - COM025 + vo.setCodeId("COM025"); + model.addAttribute("insttCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //조직정보를 조회 - ORGNZT_ID정보 + vo.setTableNm("LETTNORGNZTINFO"); + model.addAttribute("orgnztId_result", cmmUseService.selectOgrnztIdDetail(vo)); + //그룹정보를 조회 - GROUP_ID정보 + vo.setTableNm("LETTNORGNZTINFO"); + model.addAttribute("groupId_result", cmmUseService.selectGroupIdDetail(vo)); - UserManageVO userManageVO = new UserManageVO(); - userManageVO = userManageService.selectUser(uniqId); - model.addAttribute("userSearchVO", userSearchVO); - model.addAttribute("userManageVO", userManageVO); - - if(userManageVO == null){ - /*redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.select")); - RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do"); - return redirectUrlMaker.getRedirectUrl();*/ - } - - //권한조회 - AuthorManageVO authorManageVO = new AuthorManageVO(); - authorManageVO.setFirstIndex(0); - authorManageVO.setLastIndex(10); - authorManageVO.setRecordCountPerPage(10); - authorManageVO.setAuthorSet("01"); - authorManageVO.setSearchSortCnd("sort_num"); - authorManageVO.setSearchSortOrd("desc"); - authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO)); - model.addAttribute("authorList", authorManageVO.getAuthorManageList()); - //initRsa(request); - - if("ROLE_ADMIN".equals(loginVO.getAuthority())) { - model.addAttribute("isAdmin", "Y"); + UserManageVO userManageVO = new UserManageVO(); + userManageVO = userManageService.selectUser(uniqId); + model.addAttribute("userSearchVO", userSearchVO); + model.addAttribute("userManageVO", userManageVO); + + if(userManageVO == null){ + /*redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.select")); + RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do"); + return redirectUrlMaker.getRedirectUrl();*/ + } + + //권한조회 + AuthorManageVO authorManageVO = new AuthorManageVO(); + authorManageVO.setFirstIndex(0); + authorManageVO.setLastIndex(10); + authorManageVO.setRecordCountPerPage(10); + authorManageVO.setAuthorSet("01"); + authorManageVO.setSearchSortCnd("sort_num"); + authorManageVO.setSearchSortOrd("desc"); + authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO)); + model.addAttribute("authorList", authorManageVO.getAuthorManageList()); + //initRsa(request); + + if("ROLE_ADMIN".equals(loginVO.getAuthority())) { + model.addAttribute("isAdmin", "Y"); + } + + if("ROLE_USER_MEMBER".equals(loginVO.getAuthority())) { + model.addAttribute("isMember", "Y"); + } + + //selectbox 미리 만들기 + LocVO locVO = new LocVO(); + locVO.setTopLocNo(topLocNo); //최상위 매뉴번호 + List orgHiddenList = orgChartManageService.selectOrgChartListAjax(locVO); + String userOneDepth = ""; + String userTwoDepth = ""; + + if(null != userManageVO.getPartIdx() + && !"".equals(userManageVO.getPartIdx()) + ) { + for(LocVO tempLocVO : orgHiddenList) { + if(userManageVO.getPartIdx().equals(tempLocVO.getId())){ + if(1==tempLocVO.getDepths()) { //1뎁스면 조회 안함 + userOneDepth = tempLocVO.getId(); + }else { //2뎁스면 + userTwoDepth = tempLocVO.getId() ; + userOneDepth = tempLocVO.getParent() ; + } + } + } + } + model.addAttribute("userOneDepth", userOneDepth); + model.addAttribute("userTwoDepth", userTwoDepth); + model.addAttribute("orgHiddenList", orgHiddenList); + }catch(Exception ex) { + ex.printStackTrace(); } - if("ROLE_USER_MEMBER".equals(loginVO.getAuthority())) { - model.addAttribute("isMember", "Y"); - } - - //selectbox 미리 만들기 - LocVO locVO = new LocVO(); - locVO.setTopLocNo(topLocNo); //최상위 매뉴번호 - List orgHiddenList = orgChartManageService.selectOrgChartListAjax(locVO); - String userOneDepth = ""; - String userTwoDepth = ""; - - if(null != userManageVO.getPartIdx() && !"".equals(userManageVO.getPartIdx())) { - for(LocVO tempLocVO : orgHiddenList) { - if(userManageVO.getPartIdx().equals(tempLocVO.getId())){ - if(1==tempLocVO.getDepths()) { //1뎁스면 조회 안함 - userOneDepth = tempLocVO.getId(); - }else { //2뎁스면 - userTwoDepth = tempLocVO.getId() ; - userOneDepth = tempLocVO.getParent() ; - } - } - } - } - model.addAttribute("userOneDepth", userOneDepth); - model.addAttribute("userTwoDepth", userTwoDepth); - model.addAttribute("orgHiddenList", orgHiddenList); return "cmm/uss/umt/EgovUserSelectUpdt"; } @@ -650,6 +683,9 @@ public class EgovUserManageController { mberManageVO = mberManageService.selectMber(uniqId) ; model.addAttribute("userSearchVO", userSearchVO); + + mberManageVO.setMberNm(egovCryptoUtil.decrypt(mberManageVO.getMberNm())); + model.addAttribute("mberManageVO", mberManageVO); //권한조회 @@ -1212,6 +1248,20 @@ public class EgovUserManageController { } return "cmm/uss/umt/EgovMberConfigInsert"; } + + /* 회원이름 업데이트*/ + @RequestMapping("/uss/umt/EgovMberNameUpdateAjax.do") + public ModelAndView updateMberNameUpdateAjax(@ModelAttribute("mberManageVO") MberManageVO mberManageVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + mberManageVO.setMberNm(egovCryptoUtil.encrypt(mberManageVO.getMberNm())); + mberManageService.updateMberNm(mberManageVO); + return modelAndView; + + //userSearchVO.setSnsSiteName(egovCryptoUtil.encrypt(userSearchVO.getSearchKeyword())); + } /* 회원가입 설정 업데이트*/ @RequestMapping("/uss/umt/EgovMberConfigUpdateAjax.do") @@ -1540,7 +1590,7 @@ public class EgovUserManageController { return "cmm/uss/umt/EgovMberSelectUpdtView"; } - + /** * 일반회원정보 수정후 목록조회 화면으로 이동한다. * @param mberManageVO 일반회원수정정보 diff --git a/src/main/resources/egovframework/sqlmap/let/orgChart/OrgChartManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/orgChart/OrgChartManage_SQL_Tibero.xml index ab5c37c9..d8e1a923 100644 --- a/src/main/resources/egovframework/sqlmap/let/orgChart/OrgChartManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/orgChart/OrgChartManage_SQL_Tibero.xml @@ -40,7 +40,7 @@ loc.DEPTHS + 1 AS DEPTHS , sub_loc.FRST_REGIST_PNTTM , sub_loc.LOC_ORDR , - CONCAT(loc.LOC_LPAD, ',', LPAD(sub_loc.LOC_ORDR, 5, 0)) AS LOC_LPAD , + loc.LOC_LPAD|| ','|| LPAD(sub_loc.LOC_ORDR, 5, 0) AS LOC_LPAD , sub_loc.GW_STATUS FROM ITSM_LOC AS sub_loc INNER JOIN ( @@ -95,11 +95,11 @@ loc.DEPTH + 1 AS DEPTH , sub_loc.FRST_REGIST_PNTTM , sub_loc.LOC_ORDR , - CONCAT(loc.LOC_LPAD, - ",", + loc.LOC_LPAD|| + ","|| LPAD(sub_loc.LOC_ORDR, 5, - 0)) AS LOC_LPAD , + 0) AS LOC_LPAD , sub_loc.GW_STATUS FROM ITSM_LOC AS sub_loc diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Tibero.xml index e29452c1..01255f0b 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Tibero.xml @@ -82,13 +82,16 @@ sttus = #sbscrbSttus# - userId LIKE CONCAT('%',#searchKeyword#,'%') + userId LIKE '%'||#searchKeyword#||'%' - userNm LIKE CONCAT('%',#searchKeyword#,'%') + userNm LIKE '%'||#snsSiteName#||'%' - ( userNm LIKE CONCAT('%',#searchKeyword#,'%') OR userId LIKE CONCAT('%',#searchKeyword#,'%')) + ( userNm LIKE '%'||#searchKeyword#||'%' + OR + userId LIKE '%'||#searchKeyword#||'%' + ) ORDER BY 1 diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp index 77ef924a..f1eaafaa 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserManage.jsp @@ -159,7 +159,7 @@ function userListExcelDownload(){

총 건수 : 건

@@ -180,15 +180,17 @@ function userListExcelDownload(){
- - - - + + + + + + @@ -208,16 +210,21 @@ function userListExcelDownload(){ + diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index a94503ab..87c70203 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -103,8 +103,33 @@ function fnPasswordMove(){ } function fnUpdate(){ + var v_esntlId = $("#esntlId").val(); + var v_mberNm = $("#mberNm").val(); + + //alert(v_esntlId); + //alert(v_mberNm); + + //return ; + + $.ajax({ + type:"POST", + url:"", + data:{ + "uniqId": v_esntlId + , "mberNm": v_mberNm + }, + dataType:'json', + success:function(returnData, status){ + if(status == "success") { + }else{ alert("ERROR!");return;} + }, + error:function(request , status, error){ + alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error); + } + }); + //가입설정으로 validateUserManageVO 처리 안함. - var frm = document.mberManageVO ; + //var frm = document.mberManageVO ; /* if(frm.mberNm.value == ''){ alert("이름은 필수값입니다"); return ; } @@ -186,20 +211,20 @@ function fnUpdate(){ return ; } */ - if(!valiConfig()){ //환경설정 체크 - return; - } + //if(!valiConfig()){ //환경설정 체크 +// return; + //} - if(!confirm("수정하시겠습니까?")){ - return ; - } + //if(!confirm("수정하시겠습니까?")){ + //return ; + //} // // var rsa = new RSAKey(); // rsa.setPublic($('#RSAModulus').val(),$('#RSAExponent').val()); // $("#rsaPasswd").val(rsa.encrypt($("#passwdCmp").val())); // - document.mberManageVO.submit(); + //document.mberManageVO.submit(); } function fn_egov_inqire_cert() { @@ -344,7 +369,7 @@ function valiConfig(){ //설정 체크 <%-- --%> - + @@ -368,9 +393,8 @@ function valiConfig(){ //설정 체크 - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp index 861f95e8..6982c80c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/login/SsoLoginUsr.jsp @@ -123,7 +123,18 @@ function usrIdPassFind(choose){ <%-- --%> 개발자 아이디 선택 : + -->

<%-- --%>
번호이름 권한 uniqueId
+ " onclick="javascript:fnSelectMber(':'); return false;"> + + + - + ${authorResult.authorNm} - " onclick="javascript:fnSelectMber(':'); return false;"> - + " onclick="javascript:fnSelectMber(':'); return false;"> +
사용자유일키 - - - + " readonly/> + <%--
권한이름 - + "/> + <%-- --%> <%-- 215: --%>