diff --git a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java index 4cc61a94..f0afd11c 100644 --- a/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java +++ b/src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java @@ -228,12 +228,17 @@ public class EgovBBSManageController { BoardMasterVO vo = new BoardMasterVO(); vo.setBbsId(boardVO.getBbsId()); BoardMasterVO master = bbsAttrbService.selectBBSMasterInf(vo); - String listNum = ""; - if (("BBST05").equals(master.getBbsTyCode())) { - listNum = "12"; // 포토형 - } else { - listNum = master.getListNum(); + String listNum = "10"; + try { + if (("BBST05").equals(master.getBbsTyCode())) { + listNum = "12"; // 포토형 + } else { + listNum = master.getListNum(); + } + }catch(Exception ex) { + ex.printStackTrace(); } + boardVO.setPageUnit(Integer.parseInt(listNum)); boardVO.setPageSize(Integer.parseInt(master.getPageNum())); diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java index 1bb2e9a5..a3e1437b 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -1979,9 +1979,12 @@ public class EgovLoginController { } else if ("ROLE_VISIT".equals(user.getAuthority())) { return "redirect:/cmm/main/mainPage.do"; } else if ("ROLE_ADR_JRSDC".equals(user.getAuthority())) { - //return "redirect:/kccadr/oprtn/cndtnSspnIdtmt/trgtList.do"; + return "redirect:/kccadr/oprtn/cndtnSspnIdtmt/trgtList.do"; //return "redirect:/cmm/main/mainPage.do"; - return "redirect:/cop/bbs/selectBoardList.do?bbsId=BBSMSTR_000000000040"; + //return "redirect:/cop/bbs/selectBoardList.do?bbsId=BBSMSTR_000000000040"; + } else if ("ROLE_ADR_KIPO".equals(user.getAuthority())) { //시정명령 + return "redirect:/kccadr/oprtn/cmdTrgt/trgtList.do"; + } else if ("ROLE_USER_MEMBER".equals(user.getAuthority())) { System.out.println("비정상적인 사용자 redirect 임"); return "redirect:/web/main/mainPage.do"; 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 6f97e6e2..58919c86 100644 --- a/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java +++ b/src/main/java/kcc/let/uss/umt/web/EgovUserManageController.java @@ -596,7 +596,10 @@ public class EgovUserManageController { RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/cmm/main/mainPage.do"); return redirectUrlMaker.getRedirectUrl(); } + + _getAdminInfo(model, uniqId, userSearchVO, loginVO); + /* try { ComDefaultCodeVO vo = new ComDefaultCodeVO(); //패스워드힌트목록을 코드정보로부터 조회 @@ -628,9 +631,9 @@ public class EgovUserManageController { System.out.println(userManageVO); if(userManageVO == null){ - /*redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.select")); - RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do"); - return redirectUrlMaker.getRedirectUrl();*/ + //redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("fail.common.select")); + //RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/umt/user/EgovUserManage.do"); + //return redirectUrlMaker.getRedirectUrl(); } //권한조회 @@ -680,10 +683,139 @@ public class EgovUserManageController { }catch(Exception ex) { ex.printStackTrace(); } + */ return "cmm/uss/umt/EgovUserSelectUpdt"; } + /** + * 사용자정보 수정을 위해 사용자정보를 상세조회한다. + * 최고관리자의 경우에는 비밀번호를 체크하지 않는다. + * @param uniqId 상세조회대상 사용자아이디 + * @param userSearchVO 검색조건 + * @return cmm/uss/umt/EgovUserSelectUpdt + * @param model 화면모델 + * @throws Exception + */ + @RequestMapping("/uss/umt/user/EgovUserSelectUpdtView4Self.do") + public String updateUserView4Self( + //@RequestParam("selectedId") String uniqId, + @ModelAttribute("searchVO") UserDefaultVO userSearchVO, + HttpServletRequest request, + @RequestParam Map commandMap, + Model model) throws Exception { + + LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); + + System.out.println("loginVO.getAuthority()"); + System.out.println(loginVO.getAuthority()); + System.out.println(loginVO.getAuthority()); + + /* + if(!"ROLE_ADMIN".equals(loginVO.getAuthority()) && !uniqId.equals(loginVO.getUniqId())) { + + RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/cmm/main/mainPage.do"); + return redirectUrlMaker.getRedirectUrl(); + } + */ + + String uniqId = loginVO.getUniqId(); + + System.out.println("loginVO.getUniqId()"); + System.out.println(loginVO.getUniqId()); + System.out.println(loginVO.getUniqId()); + + _getAdminInfo(model, uniqId, userSearchVO, loginVO); + + /* + 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); + userManageVO = egovCryptoUtil.decryptUserManageVO(userManageVO); + model.addAttribute("userSearchVO", userSearchVO); + model.addAttribute("userManageVO", userManageVO); + + System.out.println("userManageVO"); + System.out.println(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(); + } + */ + + return "cmm/uss/umt/EgovUserSelectUpdt4Self"; + } + //사용자 수정화면 @RequestMapping("/uss/umt/user/EgovGnrlUserSelectUpdtView.do") public String updateGnrlUserView(@RequestParam("selectedId") String uniqId, @@ -921,6 +1053,10 @@ public class EgovUserManageController { //권한업데이트 egovAuthorGroupService.updateAuthorGroup(authorGroup); + System.out.println("tempLoginVO.getAuthority()"); + System.out.println(tempLoginVO.getAuthority()); + System.out.println(tempLoginVO.getAuthority()); + redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.update")); if(userManageVO.getGnrlUser().equals("N")){ if("ROLE_USER_MEMBER".equals(tempLoginVO.getAuthority())) { @@ -1726,13 +1862,7 @@ public class EgovUserManageController { return "forward:/uss/umt/mber/EgovMberList.do"; } - private boolean validationPasswd(String pw){ - String pattern = "(?=.*[0-9])(?=.*[a-z])(?=.*[!@#$%^&*()-+=])(?=\\S+$).{8,}"; - if(pw.matches(pattern)){ - return true; - } - return false; - } + @RequestMapping(value = "/uss/umt/user/PassMissResetAjax.do") public ModelAndView passMissResetAjax(@RequestParam Map commandMap, @@ -2230,7 +2360,11 @@ public class EgovUserManageController { return modelAndView; } - + ///////////////////////////////////////////////// + // + // private function + // + ///////////////////////////////////////////////// private UserManageVO _findUserWork( UserManageVO p_userManageVO, HttpServletRequest p_request @@ -2255,4 +2389,103 @@ public class EgovUserManageController { return p_userManageVO; } + + private void _getAdminInfo( + Model p_model //model + , String p_uniqId //대상자 ID 정보 + , UserDefaultVO p_userSearchVO //검색정보 + , LoginVO p_loginVO //login session 정보 + ) { + try { + ComDefaultCodeVO vo = new ComDefaultCodeVO(); + //패스워드힌트목록을 코드정보로부터 조회 + vo.setCodeId("COM022"); + p_model.addAttribute("passwordHint_result", cmmUseService.selectCmmCodeDetail(vo)); + //성별구분코드를 코드정보로부터 조회 + vo.setCodeId("COM014"); + p_model.addAttribute("sexdstnCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //사용자상태코드를 코드정보로부터 조회 + vo.setCodeId("COM013"); + p_model.addAttribute("emplyrSttusCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //소속기관코드를 코드정보로부터 조회 - COM025 + vo.setCodeId("COM025"); + p_model.addAttribute("insttCode_result", cmmUseService.selectCmmCodeDetail(vo)); + //조직정보를 조회 - ORGNZT_ID정보 + vo.setTableNm("LETTNORGNZTINFO"); + p_model.addAttribute("orgnztId_result", cmmUseService.selectOgrnztIdDetail(vo)); + //그룹정보를 조회 - GROUP_ID정보 + vo.setTableNm("LETTNORGNZTINFO"); + p_model.addAttribute("groupId_result", cmmUseService.selectGroupIdDetail(vo)); + + UserManageVO userManageVO = new UserManageVO(); + userManageVO = userManageService.selectUser(p_uniqId); + userManageVO = egovCryptoUtil.decryptUserManageVO(userManageVO); + p_model.addAttribute("userSearchVO", p_userSearchVO); + p_model.addAttribute("userManageVO", userManageVO); + + System.out.println("userManageVO"); + System.out.println(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)); + p_model.addAttribute("authorList", authorManageVO.getAuthorManageList()); + //initRsa(request); + + if("ROLE_ADMIN".equals(p_loginVO.getAuthority())) { + p_model.addAttribute("isAdmin", "Y"); + } + + if("ROLE_USER_MEMBER".equals(p_loginVO.getAuthority())) { + p_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() ; + } + } + } + } + p_model.addAttribute("userOneDepth", userOneDepth); + p_model.addAttribute("userTwoDepth", userTwoDepth); + p_model.addAttribute("orgHiddenList", orgHiddenList); + }catch(Exception ex) { + ex.printStackTrace(); + } + } + + private boolean validationPasswd(String pw){ + String pattern = "(?=.*[0-9])(?=.*[a-z])(?=.*[!@#$%^&*()-+=])(?=\\S+$).{8,}"; + if(pw.matches(pattern)){ + return true; + } + return false; + } } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp new file mode 100644 index 00000000..9d1528eb --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt4Self.jsp @@ -0,0 +1,578 @@ +<%-- + Class Name : EgovUserSelectUpdt.jsp + Description : 사용자상세조회, 수정 JSP + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2009.03.03 JJY 최초 생성 + 2011.08.31 JJY 경량환경 버전 생성 + + author : 공통서비스 개발팀 JJY + since : 2009.03.03 +--%> +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %> + + + + +관리자 수정 + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> +<%-- --%> + + + + + + + +
+
+ + +
+

관리자수정

+ +
+ + +
+ +
+ + + + + + + + + + + + + + + + + +<%-- > --%> + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + + + --%> + + + + + + + +
사용자아이디 + + + +
이름 + + +
직책 + + + + <%-- + --%> +
전화번호 + + +
팩스번호 + + +
담당업무 +
+ + +
+
+ +
+
+ +
+ +
이메일주소 + + +
비밀번호확인 + +
로그인실패 초기화 + + +
+
+ + + +
+
+ +<%-- --%> + + +
+
+ + + + +
+
+ +
+
+
+ + + +
+
+
+ + + + +
+ + +<%-- + + + + --%> + + + + + +