diff --git a/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java b/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java
index 8385e2db..622015b9 100644
--- a/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java
+++ b/src/main/java/kcc/let/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java
@@ -307,7 +307,7 @@ public class EgovCcmCmmnCodeManageController {
@ModelAttribute("searchVO") CmmnDetailCodeVO searchVO,
ModelMap model, HttpServletResponse response) throws Exception {
ObjectMapper mapper = new ObjectMapper();
- response.setHeader("Content-Type", "text/html;charset=utf-8");
+ //response.setHeader("Content-Type", "text/html;charset=utf-8");
PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
//CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO();
diff --git a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java
index 19dc2cfc..ba281665 100644
--- a/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java
+++ b/src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java
@@ -439,9 +439,9 @@ public class EgovMenuCreateManageController {
int usingOtherSiteCnt = menuCreateManageDAO.selectMenuCreatAuthCnt(menuCreatVO) ; //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
- if(usingOtherSiteCnt == 1){
+ //if(usingOtherSiteCnt == 1){
menuManageService.deleteMenuManage(menuManageVO);
- }
+ //}
/*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
if(null == loginVO){
@@ -452,9 +452,9 @@ public class EgovMenuCreateManageController {
menuCreateManageDAO.deleteMenuCreatAuthNo(menuCreatVO);
if(null != progrmManageVO.getProgrmFileNm() && !progrmManageVO.getProgrmFileNm().equals("dir")){ //프로그램만 지움
- if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
+ //if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
progrmManageService.deleteProgrm(progrmManageVO);
- }
+ //}
}
modelAndView.addObject("status", "success");
}catch (Exception e) {
diff --git a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml
index 13f68fab..17ad7050 100644
--- a/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/sym/mnu/mcm/EgovMenuCreat_SQL_Mysql.xml
@@ -211,13 +211,12 @@
A.MENU_NO > 0
]]>
- AND (B.AUTHOR_CODE = #authorCode#
- OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
- OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
+ AND B.AUTHOR_CODE IN ('ROLE_ANONYMOUS', 'ROLE_USER_MEMBER', 'ROLE_USER_MANAGER')
GROUP BY A.MENU_NO
- AND B.AUTHOR_CODE = #authorCode#
+ AND B.AUTHOR_CODE IN ('ROLE_ADMIN', 'ROLE_ADR_ADMIN', 'ROLE_VISIT')
+ GROUP BY A.MENU_NO
ORDER BY
A.UPPER_MENU_NO,
@@ -235,8 +234,7 @@
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp
index d3877083..3063ea8a 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/sym/ccm/EgovCcmCmmnCodeTree.jsp
@@ -53,6 +53,7 @@ function jstreeInit() {
"data" : {
"url" : "",
"dataType" : "json",
+ "error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); },
"data" : function (node) {
return {'id' : node.id }
}
diff --git a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp
index ca6482b2..6b928428 100644
--- a/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp
+++ b/src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp
@@ -48,6 +48,7 @@ function jstreeInit() {
"data" : {
"url" : "",
"dataType" : "json",
+ "error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); },
"data" : function (node) {
return {'id' : node.id, 'authorCode' : $('#authorCode').val() };
}