From af3adc094b88c3eaa6ec0a123c3fde5f1a19f001 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 2 Nov 2022 18:18:50 +0900 Subject: [PATCH] =?UTF-8?q?2022-11-02=2018:18=20=EA=B2=B0=EC=9E=AC=20?= =?UTF-8?q?=EB=B0=8F=20=EB=8C=80=EA=B2=B0=20=EA=B4=80=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AprvlMgrServiceImpl.java | 22 +- .../advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml | 243 ++- .../sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml | 14 +- .../WEB-INF/jsp/cop/bbs/EgovBoardMstrList.jsp | 11 + .../adjCourtCnctn/adjCourtCnctnDetail.jsp | 8 + .../adjCourtCnctn/adjCourtCnctnList.jsp | 8 +- .../adjDept/AdjustDeptManagerDetail.jsp | 10 + .../adjDept/AdjustDeptManagerList.jsp | 9 + .../jsp/kccadr/adjPgrMgr/apm/apmDetail.jsp | 9 + .../jsp/kccadr/adjPgrMgr/apm/apmList.jsp | 8 + .../adjPgrMgr/apm/popup/ojctInfoPop.jsp | 10 + .../cclt/ConciliatorManageDetail.jsp | 8 + .../adjPgrMgr/cclt/ConciliatorManageList.jsp | 8 + .../adjPgrMgr/dlvinfo/dlvinfoDetail.jsp | 8 +- .../kccadr/adjPgrMgr/dlvinfo/dlvinfoList.jsp | 10 + .../jsp/kccadr/adjPgrMgr/dtb/dtbReg.jsp | 50 +- .../exmp/answer/exmpAnswerManagerDetail.jsp | 10 + .../exmp/answer/exmpAnswerManagerList.jsp | 4 + .../exmp/app/exmpAppManagerDetail.jsp | 12 + .../adjPgrMgr/exmp/app/exmpAppManagerList.jsp | 13 +- .../exmp/effect/exmpEffectManagerDetail.jsp | 10 + .../exmp/effect/exmpEffectManagerList.jsp | 4 + .../exmp/help/exmpHelpManagerDetail.jsp | 10 + .../exmp/help/exmpHelpManagerList.jsp | 4 + .../iam/internalApprovManageDetail.jsp | 15 +- .../iam/internalApprovManageList.jsp | 10 +- .../iop/insteadOfPaymentManageDetail.jsp | 14 + .../iop/insteadOfPaymentManageDetail30.jsp | 1823 +++++++++------- .../iop/insteadOfPaymentManageDetail50.jsp | 1867 ++++++++++------- .../iop/insteadOfPaymentManageList.jsp | 3 + .../jsp/kccadr/adjPgrMgr/ojct/ojctMgrList.jsp | 5 + .../kccadr/adjReqMgr/adjReqMgrRegDetail.jsp | 12 +- .../jsp/kccadr/adjReqMgr/adjReqMgrRegList.jsp | 11 +- .../adjReqMgrOff/adjReqMgrOffDetail.jsp | 11 + .../kccadr/adjReqMgrOff/adjReqMgrOffList.jsp | 11 + .../adjReqMgrPastBasicRegist.jsp | 7 + .../adjReqMgrPast/adjReqMgrPastList.jsp | 8 + .../kccadr/adjclsmgr/adjCloseMangeDetail.jsp | 8 + .../kccadr/adjclsmgr/adjCloseMangeList.jsp | 9 + .../jsp/kccadr/adjclsmgr/docIssReqDetail.jsp | 6 + .../jsp/kccadr/adjclsmgr/docIssReqList.jsp | 8 + .../jsp/kccadr/advcSttst/memSttstList.jsp | 11 + .../sbmt/grade/SbmtGradeManagerCreate.jsp | 4 + .../jsp/kccadr/sch/SchduleManagerList.jsp | 8 + .../jsp/kccadr/sch/SchduleManagerStatus.jsp | 7 + .../WEB-INF/jsp/uss/ion/cnt/cntManageList.jsp | 11 + .../webapp/WEB-INF/jsp/web/com/webLayout.jsp | 2 +- src/main/webapp/js/kccadr/kccadrCom.js | 79 +- 48 files changed, 2940 insertions(+), 1513 deletions(-) diff --git a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java index 5caf2d05..41cf263e 100644 --- a/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/aprvl/service/impl/AprvlMgrServiceImpl.java @@ -292,8 +292,10 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr if ("A".equals(adrSbmtLineMgrUsrVO.getSbmtYn1())) { //1단계 결재 전임 if ("".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId1())) { + //대결자가 없는 경우 aprvlMgrVO.setSbmtId1(adrSbmtLineMgrUsrVO.getSbmtId1()); }else { + //대결자가 있는 경우 aprvlMgrVO.setSbmtId1(adrSbmtLineMgrUsrVO.getSbsttSbmtId1()); } //step1.결재가 안된 데이터만 확인 - sbmtYn1,2,3 @@ -301,15 +303,17 @@ public class AprvlMgrServiceImpl extends EgovAbstractServiceImpl implements Apr adrSbmtLineMgrUsrVO.setWhereQuery(" AND agnt_sbmt_id='ID1' "); adrSbmtMgrHstryService.deleteWithQuery(adrSbmtLineMgrUsrVO); - - //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry - this._insertAdrSbmtMgrHstry( - adrSbmtLineMgrUsrVO - , aprvlMgrVO - , "ID1" - , adrSbmtLineMgrUsrVO.getSbsttSbmtId1() - , adrSbmtLineMgrUsrVO.getSbmtId1() - ); + if (!"".equals(adrSbmtLineMgrUsrVO.getSbsttSbmtId1())) { + //대결자가 있는 경우만 이력을 남긴다. + //step4.이력 정보 남기기 처리를 해야 한다. I - adr_sbmt_mgr_hstry + this._insertAdrSbmtMgrHstry( + adrSbmtLineMgrUsrVO + , aprvlMgrVO + , "ID1" + , adrSbmtLineMgrUsrVO.getSbsttSbmtId1() + , adrSbmtLineMgrUsrVO.getSbmtId1() + ); + } } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml index 7f96c43d..6caffd92 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/advcSbmt/AdrSbmtLineMgrUsr_SQL_Cubrid.xml @@ -890,6 +890,247 @@ + + + - + " /> + " /> + " /> + + " /> + " /> + + " /> + " /> + <%-- " /> --%> + + + + + +
" /> " /> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp index c78dd351..6c1c132b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/exmp/answer/exmpAnswerManagerDetail.jsp @@ -30,6 +30,16 @@ 예문관리 + + + + + + + + + + - + <%-- --%> diff --git a/src/main/webapp/js/kccadr/kccadrCom.js b/src/main/webapp/js/kccadr/kccadrCom.js index a39a6a9e..fc5877b6 100644 --- a/src/main/webapp/js/kccadr/kccadrCom.js +++ b/src/main/webapp/js/kccadr/kccadrCom.js @@ -434,5 +434,82 @@ function conByteLeng(content){ } - +//메뉴별 권한 체크 - 시작시 현재 사용자의 해당 페이지 사용권한을 체크한다. +//_admin_fn_check_authority("adjReqMgrRegList", "div.cont", "ALL"); //ALL, CUD, P, R +function _admin_fn_check_authority(p_this_page_name, p_target_tag, p_target) { + + var url = ""; + url = "/kccadr/adjReqMgOff/EgovMenuAuthPstnCheckAjax.do"; + //var this_page_name = "adjReqMgrRegList"; + //alert(p_target); + $.ajax({ + type:"POST", + "url":url, + data:{ + "p_url": p_this_page_name //현재 페이지 정보를 넣어준다. 메뉴별권한관리-lettnprogrmlist 테이블의 url 컬럼값에서 like 검색 가능한 주소로 넣어야 한다. + }, + dataType:'json', + success : function(returnData, status) { + //alert(returnData.status); + if (returnData.status == "success") { + //대상데이터가 있고, 해당 내용으로 제어를 체크한다. + //alert("대상임"); + //alert(returnData.result4Check.allIs); //Y/N-전체권한여부ALL + //alert(returnData.result4Check.cudIs); //Y/N-cud권한여부 + //alert(returnData.result4Check.pIs); //Y/N-출력권한여부 + //alert(returnData.result4Check.rIs); //Y/N-r권한여부READ + + + if (returnData.result4Check.allIs=='N' && p_target=='ALL'){ //모든 권한 없는 경우 + //$('div.cont').html('해당 페이지에 대한 접근 권한이 없습니다.'); + $(p_target_tag).html('해당 페이지에 대한 접근 권한이 없습니다.'); + + }else if (returnData.result4Check.rIs=='N' && p_target=='R'){ //읽기 권한 없는 경우(상세화면) + //$('div.cont').html('해당 페이지에 대한 접근 권한이 없습니다.'); + $(p_target_tag).html('해당 페이지에 대한 접근 권한이 없습니다.'); + + } + + var v_ret = ""; + + if (returnData.result4Check.cudIs=='Y'){ //등록/수정/삭제 권한 없는 경우(리스트,상세화면) + //alert("1"); + //admin_fn_check_authority_ret("CUD"); + v_ret = "CUD"; + //return ""; + } + + if (returnData.result4Check.pIs=='Y'){ //출력 권한 없는 경우(상세화면) + //alert("12"); + //return "CUD"; + v_ret = v_ret + "P"; + //admin_fn_check_authority_ret("P"); + } + + admin_fn_check_authority_ret(v_ret); + + }else if (returnData.status == "pass") { + //상위 권한으로 패스처리 + //alert("pass-상위권한자"); + }else if (returnData.status == "nodata") { + //해당 페이지에 대한 데이터 없음 + //alert("nodata-해당페이지 제어 데이터 없음"); + }else if (returnData.status == "fail") { + //처리중 오류 발생 + //alert("fail-체크 실패DB오류"); + + }else{ + //대상 페이지가 아니다. + //alert("else"+returnData.status); + + } + }, + error : function(request , status, error) { + ;//체크정보 호출 실패 + }, + complete : function () { + ;//체크 정보 호출 완료 + } + }); +}