diff --git a/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java b/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java index 95ba7941..cdfe7dcd 100644 --- a/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java +++ b/src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java @@ -52,20 +52,20 @@ public class OgdpBean extends AbstractBean { ogdp.put("INST_NM", sgg.string("INST_NM")); ogdp.put("DEPT_CD", dept.string("DEPT_CD")); ogdp.put("DEPT_NM", dept.string("DEPT_NM")); - ogdp.put("OGDP_CD", sgg.string("INST_CD") + "/" + dept.string("DEPT_CD")); + ogdp.put("OGDP_CD", sgg.string("SGG_CD")+"/"+sgg.string("INST_CD") + ":" + dept.string("DEPT_CD")); ogdp.put("OGDP_NM", sgg.string("SGG_NM") + " / " + sgg.string("INST_NM") + " : " + dept.string("DEPT_NM")); ogdpList.add(ogdp); } } DataObject sysAdmin = new DataObject(); - sysAdmin.put("SGG_CD", "default"); - sysAdmin.put("SGG_NM", "기본 시군구"); - sysAdmin.put("INST_CD", "default"); - sysAdmin.put("INST_NM", "기본 기관"); - sysAdmin.put("DEPT_CD", "default"); - sysAdmin.put("DEPT_NM", "기본 부서"); - sysAdmin.put("OGDP_CD", "default/default"); - sysAdmin.put("OGDP_NM", "기본 시군구 / 기본 기관 : 기본 부서"); + sysAdmin.put("SGG_CD", "ADMIN"); + sysAdmin.put("SGG_NM", "관리자 시군구"); + sysAdmin.put("INST_CD", "ADMIN00"); + sysAdmin.put("INST_NM", "관리자 기관"); + sysAdmin.put("DEPT_CD", "ADMIN00"); + sysAdmin.put("DEPT_NM", "관리자 부서"); + sysAdmin.put("OGDP_CD", "ADMIN/ADMIN00:ADMIN00"); + sysAdmin.put("OGDP_NM", "관리자 시군구 / 관리자 기관 : 관리자 부서"); ogdpList.add(sysAdmin); return ogdpList; @@ -76,7 +76,7 @@ public class OgdpBean extends AbstractBean { SigunguQuery sggQuery = new SigunguQuery(); if(anonymous) { sggQuery.setSggIDs(sggCd); - } else if(!currentUser().getInstitute().equals("default")){ + } else if(!currentUser().getInstitute().equals("ADMIN00")){ sggQuery.setSggIDs(currentUser().getOrgID()); } List sggs = sigunguBean.getSigunguList(sggQuery); @@ -90,22 +90,22 @@ public class OgdpBean extends AbstractBean { ogdp.put("INST_NM", sgg.string("INST_NM")); ogdp.put("DEPT_CD", dept.string("DEPT_CD")); ogdp.put("DEPT_NM", dept.string("DEPT_NM")); - ogdp.put("OGDP_CD", sgg.string("INST_CD") + "/" + dept.string("DEPT_CD")); + ogdp.put("OGDP_CD", sgg.string("SGG_CD")+"/"+sgg.string("INST_CD") + ":" + dept.string("DEPT_CD")); ogdp.put("OGDP_NM", sgg.string("SGG_NM") + " / " + sgg.string("INST_NM") + " : " + dept.string("DEPT_NM")); ogdpList.add(ogdp); } } - if(!anonymous && currentUser().getInstitute().equals("default")) { + if(!anonymous && currentUser().getInstitute().equals("ADMIN00")) { DataObject sysAdmin = new DataObject(); - sysAdmin.put("SGG_CD", "default"); - sysAdmin.put("SGG_NM", "기본 시군구"); - sysAdmin.put("INST_CD", "default"); - sysAdmin.put("INST_NM", "기본 기관"); - sysAdmin.put("DEPT_CD", "default"); - sysAdmin.put("DEPT_NM", "기본 부서"); - sysAdmin.put("OGDP_CD", "default/default"); - sysAdmin.put("OGDP_NM", "기본 시군구 / 기본 기관 : 기본 부서"); + sysAdmin.put("SGG_CD", "ADMIN"); + sysAdmin.put("SGG_NM", "관리자 시군구"); + sysAdmin.put("INST_CD", "ADMIN00"); + sysAdmin.put("INST_NM", "관리자 기관"); + sysAdmin.put("DEPT_CD", "ADMIN00"); + sysAdmin.put("DEPT_NM", "관리자 부서"); + sysAdmin.put("OGDP_CD", "ADMIN/ADMIN00:ADMIN00"); + sysAdmin.put("OGDP_NM", "관리자 시군구 / 관리자 기관 : 관리자 부서"); ogdpList.add(sysAdmin); } return ogdpList; diff --git a/src/main/java/cokr/xit/fims/base/web/AdminController.java b/src/main/java/cokr/xit/fims/base/web/AdminController.java index afa34955..a62a3759 100644 --- a/src/main/java/cokr/xit/fims/base/web/AdminController.java +++ b/src/main/java/cokr/xit/fims/base/web/AdminController.java @@ -52,7 +52,7 @@ public class AdminController extends ApplicationController { public ModelAndView adminMain(HttpServletResponse hres) { ModelAndView mav = new ModelAndView(); - if(!currentUser().getInstitute().equals("default")) { + if(!currentUser().getInstitute().equals("ADMIN00")) { hres.setStatus(HttpStatus.FORBIDDEN.value()); mav.setViewName("jsonView"); mav.addObject("message","메뉴 접근 권한이 없습니다."); diff --git a/src/main/java/cokr/xit/fims/base/web/CodeController.java b/src/main/java/cokr/xit/fims/base/web/CodeController.java index 8ed24cb7..1ae0e1dc 100644 --- a/src/main/java/cokr/xit/fims/base/web/CodeController.java +++ b/src/main/java/cokr/xit/fims/base/web/CodeController.java @@ -48,7 +48,7 @@ public class CodeController extends cokr.xit.base.code.web.CodeController { ModelAndView mav = new ModelAndView("jsonView"); UserInfo userInfo = currentUser(); - if(userInfo.getInstitute().equals("default")) { + if(userInfo.getInstitute().equals("ADMIN00")) { mav.addObject("sggHasTask", "Y"); } else { diff --git a/src/main/java/cokr/xit/fims/base/web/OgdpController.java b/src/main/java/cokr/xit/fims/base/web/OgdpController.java index cfc778d9..a0a79702 100644 --- a/src/main/java/cokr/xit/fims/base/web/OgdpController.java +++ b/src/main/java/cokr/xit/fims/base/web/OgdpController.java @@ -83,7 +83,7 @@ public class OgdpController extends ApplicationController { UserInfo userInfo = currentUser(); - if(userInfo.getInstitute().equals("default")) { + if(userInfo.getInstitute().equals("ADMIN00")) { if(ifEmpty(sggCd, ()->"").equals("")) { mav.setViewName("fims/ogdp/select-sgg"); diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java index e66a60a2..a4c5a307 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/StngBean.java @@ -46,14 +46,14 @@ public class StngBean extends AbstractBean { return stngMapper.selectUserStng(currentUser().getId()); } else if(type.equals("dept")){ UserInfo userInfo = currentUser(); - if(userInfo.getInstitute().equals("default")) { + if(userInfo.getInstitute().equals("ADMIN00")) { return new DataObject(); } ogdpBean.initUserInfo(userInfo); return stngMapper.selectDeptStng((String)userInfo.getInfo().get("deptCd")); } else if(type.equals("sgg")){ UserInfo userInfo = currentUser(); - if(userInfo.getInstitute().equals("default")) { + if(userInfo.getInstitute().equals("ADMIN00")) { return new DataObject(); } ogdpBean.initUserInfo(userInfo); @@ -92,7 +92,7 @@ public class StngBean extends AbstractBean { List availableTaskList = new ArrayList<>(); - if(userInfo.getInstitute().equals("default")) { //최고관리자 + if(userInfo.getInstitute().equals("ADMIN00")) { //최고관리자 availableTaskList = taskList; @@ -176,7 +176,7 @@ public class StngBean extends AbstractBean { public List filterTaskSectionCodeForSgg(List taskSectionCodes) { List taskListForSgg = new ArrayList(); - if(currentUser().getInstitute().equals("default")) { + if(currentUser().getInstitute().equals("ADMIN00")) { taskListForSgg = taskSectionCodes; } else { SecuredUserInfo userInfo = currentUser(); diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml index 8a3b3b6e..00a9ad46 100644 --- a/src/main/resources/sql/mapper/base/user-mapper.xml +++ b/src/main/resources/sql/mapper/base/user-mapper.xml @@ -69,9 +69,9 @@ SELECT A.USER_ID , (SELECT GET_CODE_NM('CMN004', A.STTS) FROM DUAL) AS STTS_NM , A.NSTT_CD AS NSTT_CD , A.NSTT_CD AS INST_CD - , (CASE WHEN A.NSTT_CD = 'default' THEN '기본 기관' ELSE B.INST_NM END) AS INST_NM + , (CASE WHEN A.NSTT_CD = 'ADMIN00' THEN '관리자 기관' ELSE B.INST_NM END) AS INST_NM , A.DEPT_CD AS DEPT_CD - , (CASE WHEN A.DEPT_CD = 'default' THEN '기본 부서' ELSE B.DEPT_NM END) AS DEPT_NM + , (CASE WHEN A.DEPT_CD = 'ADMIN00' THEN '관리자 부서' ELSE B.DEPT_NM END) AS DEPT_NM , A.ORG_ID AS ORG_ID , A.ORG_ID AS SGG_CD , B.SGG_NM AS SGG_NM diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp index 6752c9ee..2f3ccb10 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp @@ -11,7 +11,7 @@ - + - + @@ -171,7 +171,7 @@ $(document).ready(function(){ $P.ntcControl.dataset.setData([ntcInfo]); $("#sggCd--${pageName}").attr("disabled","disabled"); - if(MY_INFO.institute != "default"){ + if(MY_INFO.institute != "ADMIN00"){ $("#btnSave--${pageName}").attr("hidden","hidden"); $("#btnRemove--${pageName}").attr("hidden","hidden"); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp index 84222fa8..73dcfb0e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp01010-main.jsp @@ -232,7 +232,7 @@ pageObject["${pageName}"] = {}; $(document).ready(function(){ - if(MY_INFO.institute != "default"){ + if(MY_INFO.institute != "ADMIN00"){ $(".superadmin").attr("hidden","hidden"); } @@ -340,7 +340,7 @@ $(document).ready(function(){ $("#tabButtonContainer--${pageName}").html(tabs.join("")); $("#tabContentContainer--${pageName}").html(contents.join("")); - if(MY_INFO.institute != "default"){ + if(MY_INFO.institute != "ADMIN00"){ $(".superadmin").attr("hidden","hidden"); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp index d65b34bf..2bacd852 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp @@ -334,7 +334,7 @@ $(document).ready(function(){ $P.fnReset(); fn_securityModeToggle($("#securityMode--top").is(":checked")); //보안모드 - if(MY_INFO.institute == "default"){ + if(MY_INFO.institute == "ADMIN00"){ $("#sggCd--${pageName}").removeAttr("disabled"); } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02020-info.jsp index 10856001..12627188 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02020-info.jsp @@ -344,7 +344,7 @@ $(document).ready(function(){ * 초기화 **************************************************************************/ - if(MY_INFO.institute == 'default') { + if(MY_INFO.institute == 'ADMIN00') { $("#forRootAdmin--${pageName}").removeAttr("hidden"); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp index bf7bbcd0..46d58f97 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/select-sgg.jsp @@ -7,7 +7,7 @@

시군구 선택

- +