From c16b142f597b2ef361e13706c50f4e0cce847264 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Thu, 17 Nov 2022 17:55:51 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20html=20indent=20fix=20=20=20=20=20=20htm?= =?UTF-8?q?l=20=ED=91=9C=EC=A4=80=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mng/code/code-cfn-mysql-mapper.xml | 12 +- .../mng/code/code-dtl-mysql-mapper.xml | 27 +- .../mng/code/code-grp-mysql-mapper.xml | 12 +- .../framework/mng/code/zip-mysql-mapper.xml | 93 +++++++ .../biz/mng/auth/mngAuthAuthorMgtForm.jsp | 34 +-- .../biz/mng/auth/mngAuthAuthorMgtPopup.jsp | 233 +++++++++--------- .../biz/mng/auth/mngAuthByUserMgtForm.jsp | 44 ++-- .../biz/mng/auth/mngAuthGrpMgtForm.jsp | 20 +- .../biz/mng/auth/mngAuthGrpMgtPopup.jsp | 82 +++--- .../biz/mng/auth/mngAuthHierarchyMgtForm.jsp | 26 +- .../biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp | 10 +- .../biz/mng/auth/mngAuthRoleMgtForm.jsp | 34 +-- .../biz/mng/code/mngCodeCfnMgtForm.jsp | 19 +- .../biz/mng/code/mngCodeDtlMgtForm.jsp | 59 ++--- .../biz/mng/code/mngCodeDtlMgtPopup.jsp | 122 ++++----- .../biz/mng/code/mngCodeGrpMgtForm.jsp | 20 +- .../biz/mng/menu/mngMenuByRoleMgtForm.jsp | 12 +- .../biz/mng/menu/mngMenuByRoleMgtPopup.jsp | 90 +++---- .../framework/biz/mng/menu/mngMenuMgtForm.jsp | 18 +- .../biz/mng/menu/mngMenuMgtPopup.jsp | 136 +++++----- .../biz/mng/menu/mngProgramMgtForm.jsp | 12 +- .../biz/mng/menu/mngProgramSearchPopup.jsp | 28 +-- .../framework/biz/mng/usr/mngUserMgtForm.jsp | 18 +- .../framework/js/egov/EgovMenuCreat.js | 6 +- 24 files changed, 638 insertions(+), 529 deletions(-) create mode 100644 src/main/resources/sqlmapper/framework/mng/code/zip-mysql-mapper.xml diff --git a/src/main/resources/sqlmapper/framework/mng/code/code-cfn-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/code/code-cfn-mysql-mapper.xml index b393da69..9d653804 100644 --- a/src/main/resources/sqlmapper/framework/mng/code/code-cfn-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/code/code-cfn-mysql-mapper.xml @@ -17,13 +17,11 @@ , last_updusr_id FROM xit_cmmn_cl_code - - - AND INSTR(cl_code, #{searchKeyword}) > 0 - - - AND INSTR(cl_code_nm, #{searchKeyword}) > 0 - + + AND INSTR(cl_code, #{clCode}) > 0 + + + AND INSTR(cl_code_nm, #{clCodeNm}) > 0 diff --git a/src/main/resources/sqlmapper/framework/mng/code/code-dtl-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/code/code-dtl-mysql-mapper.xml index 05be7129..0aea6908 100644 --- a/src/main/resources/sqlmapper/framework/mng/code/code-dtl-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/code/code-dtl-mysql-mapper.xml @@ -25,22 +25,23 @@ JOIN xit_cmmn_code xcc ON cdc.code_id = xcc.code_id - - - AND INSTR(cdc.code_id, #{searchKeyword}) > 0 - - - AND INSTR(cdc.code, #{searchKeyword}) > 0 - - - AND INSTR(cdc.code_nm, #{searchKeyword}) > 0 - - - AND xcc.cl_code = #{clCode} + AND xcc.cl_code = #{clCode} + + + AND INSTR(cdc.code_id, #{codeId}) > 0 + + + AND INSTR(xcc.code_id_nm, #{codeIdNm}) > 0 + + + AND INSTR(cdc.code, #{code}) > 0 + + + AND INSTR(cdc.code_nm, #{codeNm}) > 0 - AND cdc.use_at = #{useAt} + AND cdc.use_at = #{useAt} diff --git a/src/main/resources/sqlmapper/framework/mng/code/code-grp-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/code/code-grp-mysql-mapper.xml index 0a9effad..31de1a2c 100644 --- a/src/main/resources/sqlmapper/framework/mng/code/code-grp-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/framework/mng/code/code-grp-mysql-mapper.xml @@ -24,13 +24,11 @@ AND xcc.cl_code = #{clCode} - - - AND INSTR(xcc.code_id, #{searchKeyword}) > 0 - - - AND INSTR(xcc.code_id_nm, #{searchKeyword}) > 0 - + + AND INSTR(xcc.code_id, #{codeId}) > 0 + + + AND INSTR(xcc.code_id_nm, #{codeIdNm}) > 0 AND xcc.use_at = #{useAt} diff --git a/src/main/resources/sqlmapper/framework/mng/code/zip-mysql-mapper.xml b/src/main/resources/sqlmapper/framework/mng/code/zip-mysql-mapper.xml new file mode 100644 index 00000000..5925b886 --- /dev/null +++ b/src/main/resources/sqlmapper/framework/mng/code/zip-mysql-mapper.xml @@ -0,0 +1,93 @@ + + + + + + + SELECT zip + , sn + , ctprvn_nm + , signgu_nm + , emd_nm + , li_buld_nm + , lnbr_dong_ho + , frst_regist_pnttm + , frst_register_id + , last_updt_pnttm + , last_updusr_id + FROM xit_zip + + + AND INSTR(cl_code, #{searchKeyword}) > 0 + + + AND INSTR(cl_code_nm, #{searchKeyword}) > 0 + + + + + + + + + + /* code-cfn-mysql-mapper|insertCmmnClCode-분류코드 정보 등록|julim */ + INSERT + INTO xit_cmmn_cl_code ( + cl_code + , cl_code_nm + , cl_code_dc + , use_at + , frst_regist_pnttm + , frst_register_id + ) VALUE ( + #{clCode} + , #{clCodeNm} + , #{clCodeDc} + , #{useAt} + , NOW() + , #{frstRegisterId} + ) + + + + /* code-cfn-mysql-mapper|updateCmmnClCode-분류코드 정보 변경|julim */ + UPDATE xit_cmmn_cl_code + SET cl_code_nm = IF(cl_code_nm = #{clCodeNm}, cl_code_nm, #{clCodeNm}) + , cl_code_dc = IF(cl_code_dc = #{clCodeDc}, cl_code_dc, #{clCodeDc}) + , use_at = #{useAt} + , last_updt_pnttm = NOW() + , last_updusr_id = #{lastUpdusrId} + WHERE cl_code = #{clCode} + + + + /* code-cfn-mysql-mapper|deleteCmmnClCode-분류코드 정보 삭제|julim */ + DELETE + FROM xit_cmmn_cl_code + WHERE cl_code = #{clCode} + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp index be718374..8738ed09 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtForm.jsp @@ -6,23 +6,25 @@ - - - - - - - - - + + + + + + + + + - - - + + + +
검색조건
권한명 - - - -
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp index b23e34f1..b73b2e0e 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthAuthorMgtPopup.jsp @@ -1,4 +1,4 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> @@ -6,131 +6,134 @@
-
- <%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp"%> -
- - - - - - - - - - - - - - - - - - - - - - -
/
- - - - -   - - -   - - -
- - -   -
- - - -
- - - -
-
- <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%> -
+
+ <%@include file="/WEB-INF/jsp/framework/biz-popup-title.jsp" %> +
+ + + + + + + + + + + + + + + + + + + + + + + + +
/
+ + + + +   + + +   + + +
+ + +   +
+ + + +
+ + + +
+
+ <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp" %> +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp index 317812a7..3571d727 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthByUserMgtForm.jsp @@ -6,28 +6,30 @@ - - - - - - - - - + + + + + + + + + - - + + + +
검색조건
- - "/> - - - -
+ + "/> + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp index 30569ca0..c07523b9 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtForm.jsp @@ -7,8 +7,8 @@ - - + + @@ -16,13 +16,15 @@ - - - + + + +
검색조건
권한그룹명 - - - -
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp index def7f125..939fc83e 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthGrpMgtPopup.jsp @@ -16,46 +16,48 @@ - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp"%> diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp index dd9bfc42..d73e24da 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthHierarchyMgtForm.jsp @@ -7,22 +7,24 @@ - - - + + + + + - - - - - + + + +
검색조건
권한명 - - - -
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp index aa1318f9..a7f685aa 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleGrantMgtPopup.jsp @@ -10,18 +10,18 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
검색조건
권한코드 : + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp index 6845e3cd..b059ab14 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/auth/mngAuthRoleMgtForm.jsp @@ -6,23 +6,25 @@ - - - - - - - - - + + + + + + + + + - - - + + + +
검색조건
롤(역할)명 - - - -
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp index 2206be28..f805608d 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeCfnMgtForm.jsp @@ -6,26 +6,25 @@ - - + + + - - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp index a854bc23..0a28f53a 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtForm.jsp @@ -7,40 +7,41 @@ - + + + - - - - - - - - - - + + + + + + + +
검색조건
- + + + - + + +
검색조건
- - - - - - - - -
+ + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp index 157a27be..456fb2db 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeDtlMgtPopup.jsp @@ -22,67 +22,67 @@
- - - - - - - - - - - -
- - - - -
- - - - -
- - - - - - -
- - - - -
+ + + + + + + + + + + +
+ + + + +
+ + + + +
+ + + + + + +
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp index d63e7583..ceaa0227 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/code/mngCodeGrpMgtForm.jsp @@ -7,13 +7,11 @@ 검색조건 - + + - - - @@ -22,12 +20,12 @@ - - + + + + + + - + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp index 31b5fa68..71b300d1 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtForm.jsp @@ -7,18 +7,18 @@ - - - + + + + + - - -
검색조건
권한코드 + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp index 2a496095..a26ede94 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuByRoleMgtPopup.jsp @@ -12,17 +12,21 @@ - - + + + + + + - - - - + + +
검색조건
권한코드 - -
+ + +
@@ -36,45 +40,47 @@ - - - - + + + + +
메뉴일괄등록
  - - -
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp index 685ee865..4cebf3c4 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtForm.jsp @@ -7,25 +7,25 @@ - - - - - + + + + + + - - - - diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtPopup.jsp index c2e510ad..7ec026a5 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngMenuMgtPopup.jsp @@ -26,74 +26,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
검색조건
메뉴번호 + 메뉴명 + +
- - - - - - - - - -
- - - - - - 프로그램파일명 검색 -
- - - - - - - - - -
- - - - - - - - - -
- - - - -
+ + + + + + + + + +
+ + + + + + 프로그램파일명 검색 +
+ + + + + + + + + +
+ + + + + + + + + +
+ + + + +
<%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp" %> diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp index d1e62c7f..b44559ab 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramMgtForm.jsp @@ -7,18 +7,18 @@ - - - + + + + + - - -
검색조건
프로그램 한글명 + diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramSearchPopup.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramSearchPopup.jsp index b15f93ca..911d79ce 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramSearchPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/menu/mngProgramSearchPopup.jsp @@ -11,24 +11,24 @@ - - - + + + + + - - - - - - - + + + +
검색조건
프로그램 한글명 - - - -
+ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp index bc0fe109..938db91d 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserMgtForm.jsp @@ -6,15 +6,15 @@ - - - - - - - - - + + + + + + + + +
검색조건
diff --git a/src/main/webapp/resources/framework/js/egov/EgovMenuCreat.js b/src/main/webapp/resources/framework/js/egov/EgovMenuCreat.js index 5fd558ad..55d58125 100644 --- a/src/main/webapp/resources/framework/js/egov/EgovMenuCreat.js +++ b/src/main/webapp/resources/framework/js/egov/EgovMenuCreat.js @@ -37,7 +37,7 @@ function createTree(arrName) { treeNodes[getTreeArrayId(startNode)].split("|"); } else { document.write(" ROOT"); - document.write("

"); + document.write("
"); } const recursedNodes = new Array(); addTreeNode(startNode, recursedNodes); @@ -104,12 +104,12 @@ function addTreeNode(parentNode, recursedNodes) { const lastSibling = lastTreeSibling(nodeValues[0], nodeValues[1]); const hasChildNode = hasChildTreeNode(nodeValues[0]); const isNodeOpen = isTreeNodeOpen(nodeValues[0]); - recursedNodes.forEach(()=>document.write("     ")); + recursedNodes.forEach(()=>document.write("   ")); if (lastSibling) recursedNodes.push(0); else recursedNodes.push(1); - document.write("     "); + document.write("   "); //document.write(" L "); document.write("