이지우 - 관리자 코드관리(기존에 안열림), 메뉴관리(삭제 시 생성내역도 전부 삭제하게) 수정
This commit is contained in:
parent
32da5b98c1
commit
c8d84851f2
@ -307,7 +307,7 @@ public class EgovCcmCmmnCodeManageController {
|
|||||||
@ModelAttribute("searchVO") CmmnDetailCodeVO searchVO,
|
@ModelAttribute("searchVO") CmmnDetailCodeVO searchVO,
|
||||||
ModelMap model, HttpServletResponse response) throws Exception {
|
ModelMap model, HttpServletResponse response) throws Exception {
|
||||||
ObjectMapper mapper = new ObjectMapper();
|
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"));
|
PrintWriter out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), "UTF-8"));
|
||||||
|
|
||||||
//CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO();
|
//CmmnDetailCodeVO searchVO = new CmmnDetailCodeVO();
|
||||||
|
|||||||
@ -439,9 +439,9 @@ public class EgovMenuCreateManageController {
|
|||||||
|
|
||||||
|
|
||||||
int usingOtherSiteCnt = menuCreateManageDAO.selectMenuCreatAuthCnt(menuCreatVO) ; //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
|
int usingOtherSiteCnt = menuCreateManageDAO.selectMenuCreatAuthCnt(menuCreatVO) ; //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
|
||||||
if(usingOtherSiteCnt == 1){
|
//if(usingOtherSiteCnt == 1){
|
||||||
menuManageService.deleteMenuManage(menuManageVO);
|
menuManageService.deleteMenuManage(menuManageVO);
|
||||||
}
|
//}
|
||||||
|
|
||||||
/*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
|
/*LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
|
||||||
if(null == loginVO){
|
if(null == loginVO){
|
||||||
@ -452,9 +452,9 @@ public class EgovMenuCreateManageController {
|
|||||||
|
|
||||||
menuCreateManageDAO.deleteMenuCreatAuthNo(menuCreatVO);
|
menuCreateManageDAO.deleteMenuCreatAuthNo(menuCreatVO);
|
||||||
if(null != progrmManageVO.getProgrmFileNm() && !progrmManageVO.getProgrmFileNm().equals("dir")){ //프로그램만 지움
|
if(null != progrmManageVO.getProgrmFileNm() && !progrmManageVO.getProgrmFileNm().equals("dir")){ //프로그램만 지움
|
||||||
if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
|
//if(usingOtherSiteCnt == 1){ //다른 사이트 아이디가 매뉴를 사용할시 매뉴 삭제안한다.
|
||||||
progrmManageService.deleteProgrm(progrmManageVO);
|
progrmManageService.deleteProgrm(progrmManageVO);
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
modelAndView.addObject("status", "success");
|
modelAndView.addObject("status", "success");
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
|
|||||||
@ -211,13 +211,12 @@
|
|||||||
A.MENU_NO > 0
|
A.MENU_NO > 0
|
||||||
]]>
|
]]>
|
||||||
<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
||||||
AND (B.AUTHOR_CODE = #authorCode#
|
AND B.AUTHOR_CODE IN ('ROLE_ANONYMOUS', 'ROLE_USER_MEMBER', 'ROLE_USER_MANAGER')
|
||||||
OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
|
|
||||||
OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
|
|
||||||
GROUP BY A.MENU_NO
|
GROUP BY A.MENU_NO
|
||||||
</isEqual>
|
</isEqual>
|
||||||
<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
||||||
AND B.AUTHOR_CODE = #authorCode#
|
AND B.AUTHOR_CODE IN ('ROLE_ADMIN', 'ROLE_ADR_ADMIN', 'ROLE_VISIT')
|
||||||
|
GROUP BY A.MENU_NO
|
||||||
</isNotEqual>
|
</isNotEqual>
|
||||||
ORDER BY
|
ORDER BY
|
||||||
A.UPPER_MENU_NO,
|
A.UPPER_MENU_NO,
|
||||||
@ -235,8 +234,7 @@
|
|||||||
|
|
||||||
<delete id="menuManageDAO.deleteMenuCreatAuthNo" parameterClass="menuCreatVO" >
|
<delete id="menuManageDAO.deleteMenuCreatAuthNo" parameterClass="menuCreatVO" >
|
||||||
DELETE FROM LETTNMENUCREATDTLS
|
DELETE FROM LETTNMENUCREATDTLS
|
||||||
WHERE AUTHOR_CODE=#authorCode#
|
WHERE MENU_NO= #menuNo#
|
||||||
AND MENU_NO= #menuNo#
|
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<select id="menuManageDAO.selectMenuListJtreeWeb" parameterClass="menuManageJTreeVO" resultClass="menuManageJTreeVO" cacheModel="cache-webMainMenu">
|
<select id="menuManageDAO.selectMenuListJtreeWeb" parameterClass="menuManageJTreeVO" resultClass="menuManageJTreeVO" cacheModel="cache-webMainMenu">
|
||||||
|
|||||||
@ -99,12 +99,10 @@
|
|||||||
<isNotEmpty property="authorCode" > /* 매뉴사용여부 조회 */
|
<isNotEmpty property="authorCode" > /* 매뉴사용여부 조회 */
|
||||||
|
|
||||||
<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
<isEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
||||||
AND (B.AUTHOR_CODE = #authorCode#
|
AND B.AUTHOR_CODE IN ('ROLE_ANONYMOUS', 'ROLE_USER_MEMBER', 'ROLE_USER_MANAGER')
|
||||||
OR B.AUTHOR_CODE = 'ROLE_USER_MEMBER'
|
|
||||||
OR B.AUTHOR_CODE = 'ROLE_USER_MANAGER')
|
|
||||||
</isEqual>
|
</isEqual>
|
||||||
<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
<isNotEqual property="authorCode" compareValue="ROLE_ANONYMOUS">
|
||||||
AND B.AUTHOR_CODE = #authorCode#
|
AND B.AUTHOR_CODE IN ('ROLE_ADMIN', 'ROLE_ADR_ADMIN', 'ROLE_VISIT')
|
||||||
</isNotEqual>
|
</isNotEqual>
|
||||||
</isNotEmpty>
|
</isNotEmpty>
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
|
|||||||
@ -53,6 +53,7 @@ function jstreeInit() {
|
|||||||
"data" : {
|
"data" : {
|
||||||
"url" : "<c:url value='/sym/ccm/ccc/EgovCcmCmmnCodeTreeInitAjax.do'/>",
|
"url" : "<c:url value='/sym/ccm/ccc/EgovCcmCmmnCodeTreeInitAjax.do'/>",
|
||||||
"dataType" : "json",
|
"dataType" : "json",
|
||||||
|
"error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); },
|
||||||
"data" : function (node) {
|
"data" : function (node) {
|
||||||
return {'id' : node.id }
|
return {'id' : node.id }
|
||||||
}
|
}
|
||||||
|
|||||||
@ -48,6 +48,7 @@ function jstreeInit() {
|
|||||||
"data" : {
|
"data" : {
|
||||||
"url" : "<c:url value='/sym/mnu/mcm/EgovMenuCreatSelectJtreeAjax.do'/>",
|
"url" : "<c:url value='/sym/mnu/mcm/EgovMenuCreatSelectJtreeAjax.do'/>",
|
||||||
"dataType" : "json",
|
"dataType" : "json",
|
||||||
|
"error": function (jqXHR, textStatus, errorThrown) {$('#kopost_organization').html(textStatus + "//" + errorThrown); },
|
||||||
"data" : function (node) {
|
"data" : function (node) {
|
||||||
return {'id' : node.id, 'authorCode' : $('#authorCode').val() };
|
return {'id' : node.id, 'authorCode' : $('#authorCode').val() };
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user