diff --git a/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml index ecc3009e..02700672 100644 --- a/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/cmm/XitFrameCrud-mysql-mapper.xml @@ -2863,7 +2863,7 @@ FROM XIT_USER_INFO A LEFT JOIN XIT_USER_ETC_OPTION B ON A.USER_ID=B.USER_ID WHERE 1=1 - AND A.USER_ID = #{user_id } + AND A.USER_ID = #{userId } @@ -2889,7 +2889,7 @@ ,AUTHOR_CODE FROM XIT_USER_SCRTY_SETUP WHERE 1=1 - AND SCRTY_SETUP_TRGET_ID = #{scrty_setup_trget_id} + AND SCRTY_SETUP_TRGET_ID = #{scrtySetupTrgetId} /** addXitUserScrtySetup */ @@ -2900,8 +2900,8 @@ ,AUTHOR_CODE )VALUES( #{scrty_setup_trget_id} - ,#{mber_ty_code } - ,#{author_code } + ,#{mberTyCode } + ,#{authorCode } ) @@ -2909,17 +2909,17 @@ /** 사용자보안설정 수정 */ UPDATE XIT_USER_SCRTY_SETUP SET - MBER_TY_CODE = IFNULL(#{mber_ty_code }, MBER_TY_CODE) - ,AUTHOR_CODE = #{author_code } + MBER_TY_CODE = IFNULL(#{mberTyCode }, MBER_TY_CODE) + ,AUTHOR_CODE = #{authorCode } WHERE 1=1 - AND SCRTY_SETUP_TRGET_ID = #{scrty_setup_trget_id} + AND SCRTY_SETUP_TRGET_ID = #{scrtySetupTrgetId} /** removeXitUserScrtySetup */ /** 사용자보안설정 삭제 */ DELETE FROM XIT_USER_SCRTY_SETUP WHERE 1=1 - AND SCRTY_SETUP_TRGET_ID = #{scrty_setup_trget_id} + AND SCRTY_SETUP_TRGET_ID = #{scrtySetupTrgetId} diff --git a/src/main/resources/sqlmapper/sql-mapper-config.xml b/src/main/resources/sqlmapper/sql-mapper-config.xml index 3ae2e333..3bffc0e3 100644 --- a/src/main/resources/sqlmapper/sql-mapper-config.xml +++ b/src/main/resources/sqlmapper/sql-mapper-config.xml @@ -28,7 +28,7 @@ Settings 설정 옵션 사이트 참조 -.사이트주소: https://postitforhooney.tistory.com/entry/MyBatisSetting-Mybatis%EC%97%90%EC%84%9C-%ED%95%84%EC%9A%94%ED%95%9C-%EB%B6%80%EB%B6%84%EB%93%A4-setting%EC%9E%90%EB%A3%8C --> - + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp index 985cac1b..58f0ad8a 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtFrom.jsp @@ -135,7 +135,6 @@ var XitProgramMng = { url: '' , method: 'get' , serializer: (params) => { - debugger return fnAddPageInfo(document.frmSearch, params);; } } @@ -245,6 +244,7 @@ var XitProgramMng = { * 페이지 이동 -외부사이트 링크가 필요 시 사용(내부코드는 각 페이지에 맞게 수정, ex>https://www.gov.kr/portal/main ) ======================== */ + pageLink: function(flag, url, params){ switch (flag) { case "move": //페이지 이동 @@ -259,6 +259,8 @@ var XitProgramMng = { break; } }, + + /* ======================== * 페이지 Open -팝업페이지를 Open 한다. @@ -291,10 +293,28 @@ var XitProgramMng = { -상세 팝업을 OPEN 한다. ======================== */ fnClickProgramBtn: function(props){ +<%-- var rowData = props.grid.getRow(props.rowKey); var params = ""; params += "progrmFileNm=" + rowData.progrmFileNm; XitProgramMng.pagePopup('detail', "", params); +--%> + + + let rowData = props.grid.getRow(props.rowKey); + CmmPopup.open('', + { + tilesDef: 'popup', + progrmFileNm: rowData.progrmFileNm + }, + { + width: 655, + height: 720 + }, + '프로그램 상세' + ) + + } } diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/XitProgramMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMng_edit.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/XitProgramMng_edit.jsp rename to src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMng_edit.jsp diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/XitProgramMng_input.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMng_input.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/XitProgramMng_input.jsp rename to src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMng_input.jsp diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/ProgramMng.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/ProgramMng.jsp deleted file mode 100644 index c726272a..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/ProgramMng.jsp +++ /dev/null @@ -1,310 +0,0 @@ -<%@ page language="java" 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 uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - -
- - - - - - - - - - - - - - -
- - 등록 - 삭제 - -
- -
-
-
- - -
- - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/XitProgramMng.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/XitProgramMng.jsp deleted file mode 100644 index e70c3ba8..00000000 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/program/XitProgramMng.jsp +++ /dev/null @@ -1,310 +0,0 @@ -<%@ page language="java" 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 uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - -
- - - - - - - - - - - - - - -
- - 등록 - 삭제 - -
- -
-
-
- - -
- -