diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index 4d1f1eb6..152fd34b 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -157,7 +157,7 @@ public class EgovMainController { @SuppressWarnings("unchecked") @RequestMapping(value = "/cmm/main/mainPage.do") public String selectGetMgtMainPage(HttpServletRequest request, ModelMap model, HttpSession session) throws Exception{ - LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); +// LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); diff --git a/src/main/java/seed/com/user/counsel/WebCounselController.java b/src/main/java/seed/com/user/counsel/WebCounselController.java index 45e8f881..c84dc141 100644 --- a/src/main/java/seed/com/user/counsel/WebCounselController.java +++ b/src/main/java/seed/com/user/counsel/WebCounselController.java @@ -237,6 +237,12 @@ public class WebCounselController { @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){ setSessionMessageRemove(session); + + // CI 체크 + if(!FairnetUtils.ciCheck(map, session)) { + return new ModelAndView("/_common/jsp/umessage"); + } + /*----권한체크----*/ Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0")); diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index a561e0b5..ca5544eb 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -132,7 +132,7 @@ public class WebMediationController { , HttpServletRequest req){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } @@ -306,7 +306,7 @@ public class WebMediationController { // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } // String tempHpDi = SeedUtils.setReplaceNull(session.getAttribute("hpDi")); @@ -480,7 +480,7 @@ public class WebMediationController { , HttpServletRequest req){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } @@ -677,7 +677,7 @@ public class WebMediationController { , HttpServletRequest req){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } @@ -871,7 +871,7 @@ public class WebMediationController { , HttpServletRequest req){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } @@ -1161,7 +1161,7 @@ public class WebMediationController { // req.getSession().setAttribute("hpName", dataObject.get("hpName")); // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } @@ -1290,7 +1290,7 @@ public class WebMediationController { ){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } @@ -1441,7 +1441,7 @@ public class WebMediationController { ){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } @@ -2002,7 +2002,7 @@ public class WebMediationController { @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -2341,7 +2341,7 @@ public class WebMediationController { // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -2775,7 +2775,7 @@ public class WebMediationController { @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){ // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -2996,7 +2996,7 @@ public class WebMediationController { // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -3189,7 +3189,7 @@ public class WebMediationController { // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -3375,7 +3375,7 @@ public class WebMediationController { // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -3598,7 +3598,7 @@ public class WebMediationController { // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -3890,7 +3890,7 @@ public class WebMediationController { // CI 체크 - if(!ciCheck(map, session)) { + if(!FairnetUtils.ciCheck(map, session)) { paramMap.put("sts", "fail"); return new ResponseEntity<>(paramMap, HttpStatus.OK); } @@ -4318,6 +4318,11 @@ public class WebMediationController { } } + // CI 체크 + if(!FairnetUtils.ciCheck(map, session)) { + return new ModelAndView("/_common/jsp/umessage"); + } + try { //접수번호 구하기(rceptNo) Map masterInfo = service.masterList(paramMap); @@ -4345,11 +4350,6 @@ public class WebMediationController { map.put("self", ""); return new ModelAndView("/_common/jsp/umessage"); } - - // CI 체크 - if(!ciCheck(map, session)) { - return new ModelAndView("/_common/jsp/umessage"); - } session.setAttribute("caseNo", SeedUtils.setReplaceNull(paramMap.get("caseNo"))); return new ModelAndView("redirect:/web/user/mediation/case/03/155/checkMediationStep03.do"); @@ -4729,21 +4729,7 @@ public class WebMediationController { mav.setViewName("_extra/web/user/mediation/caseViewer"); return mav; } - private Boolean ciCheck(ModelMap map, HttpSession session) { - String certNm = SeedUtils.setReplaceNull(session.getAttribute("certNm")); - String certHpNo = SeedUtils.setReplaceNull(session.getAttribute("certHpNo")); - if("".equals(certNm) || "".equals(certHpNo)){ - map.put("siteIdx", "case"); - map.put("url", "/web/user/mypage/case/01/168/myCheck.do"); - map.put("message", "user.message.medi.ci.alert"); - map.put("opener", ""); - map.put("append", ""); - map.put("self", ""); - - return false; - } - return true; - } + @RequestMapping(value = "/web/user/mediation/case/pdf/pdfDownload.do") public void downloadPdf( diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index 8f995878..a55cb9ed 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -295,6 +295,11 @@ private Logger log = Logger.getLogger(this.getClass()); } */ + // CI 체크 + if(!FairnetUtils.ciCheck(map, session)) { + return new ModelAndView("/_common/jsp/umessage"); + } + System.out.println("1"); boolean b_ret_u = true; @@ -696,6 +701,10 @@ private Logger log = Logger.getLogger(this.getClass()); return new ModelAndView("/_common/jsp/umessage"); } */ + // CI 체크 + if(!FairnetUtils.ciCheck(map, session)) { + return new ModelAndView("/_common/jsp/umessage"); + } boolean b_ret_u = true; map = FairnetUtils.myCheck(map, session); diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index a19ccb6b..bf19126d 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -747,4 +747,20 @@ public class FairnetUtils { return null; // return status; } + + public static Boolean ciCheck(ModelMap map, HttpSession session) { + String certNm = SeedUtils.setReplaceNull(session.getAttribute("certNm")); + String certHpNo = SeedUtils.setReplaceNull(session.getAttribute("certHpNo")); + if("".equals(certNm) || "".equals(certHpNo)){ + map.put("siteIdx", "case"); + map.put("url", "/web/user/mypage/case/01/168/myCheck.do"); + map.put("message", "user.message.medi.ci.alert"); + map.put("opener", ""); + map.put("append", ""); + map.put("self", ""); + + return false; + } + return true; + } } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/sec/rgm/EgovAuthorGroup_SQL_Oracle.xml b/src/main/resources/egovframework/sqlmap/let/sec/rgm/EgovAuthorGroup_SQL_Oracle.xml index d23a9339..d8c24a7f 100644 --- a/src/main/resources/egovframework/sqlmap/let/sec/rgm/EgovAuthorGroup_SQL_Oracle.xml +++ b/src/main/resources/egovframework/sqlmap/let/sec/rgm/EgovAuthorGroup_SQL_Oracle.xml @@ -142,6 +142,9 @@ DUAL ) S ON (D.SCRTY_DTRMN_TRGET_ID = S.SCRTY_DTRMN_TRGET_ID) + WHEN MATCHED THEN + UPDATE SET D.MBER_TY_CODE = S.MBER_TY_CODE, + D.AUTHOR_CODE = S.AUTHOR_CODE WHEN NOT MATCHED THEN INSERT (SCRTY_DTRMN_TRGET_ID, MBER_TY_CODE, AUTHOR_CODE) VALUES (S.SCRTY_DTRMN_TRGET_ID, S.MBER_TY_CODE, S.AUTHOR_CODE) diff --git a/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp b/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp index 837a494a..8e873630 100644 --- a/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp +++ b/src/main/webapp/WEB-INF/jsp/_common/jsp/umessage.jsp @@ -54,7 +54,7 @@

- +