From 3a58c44c03b4740aba01c3e9a01dd0c3e122920a Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Mon, 26 Feb 2024 10:36:18 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/cmmn/web/StngController.java | 15 +++------------ .../crdn/service/bean/ImportServiceBean.java | 3 +-- .../xit/fims/crdn/web/Crdn01Controller.java | 4 ++-- .../xit/fims/crdn/web/Crdn02Controller.java | 3 +-- .../xit/fims/crdn/web/Crdn03Controller.java | 3 +-- .../xit/fims/crdn/web/Crdn05Controller.java | 12 +++++------- .../xit/fims/crdn/web/Crdn06Controller.java | 6 ++---- .../xit/fims/crdn/web/Crdn07Controller.java | 13 +++++-------- .../xit/fims/crdn/web/Crdn08Controller.java | 9 +++------ .../xit/fims/cvlc/web/Cvlc01Controller.java | 9 +++------ .../xit/fims/cvlc/web/Cvlc02Controller.java | 3 +-- .../xit/fims/cvlc/web/Cvlc03Controller.java | 3 +-- .../xit/fims/cvlc/web/Cvlc04Controller.java | 6 ++---- .../xit/fims/cvlc/web/Cvlc05Controller.java | 6 ++---- .../xit/fims/cvlc/web/Cvlc06Controller.java | 6 ++---- .../xit/fims/sprt/web/Sprt01Controller.java | 5 +---- .../xit/fims/stat/web/Stat01Controller.java | 18 ++++++------------ 17 files changed, 41 insertions(+), 83 deletions(-) diff --git a/src/main/java/cokr/xit/fims/cmmn/web/StngController.java b/src/main/java/cokr/xit/fims/cmmn/web/StngController.java index d4cf50e7..c7a310b4 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/StngController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/StngController.java @@ -94,10 +94,7 @@ public class StngController extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); //출력 설정 제목 - String institute = currentUser().getInstitute(); - String account = currentUser().getAccount(); - ManagedUser currentUser = userMapper.getUser(account, institute); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); DataObject sgg = statMapper.selectSggByCode(sggCd); String sggNm = sgg.string("NAME"); @@ -140,10 +137,7 @@ public class StngController extends ApplicationController { boolean saved = false; if(backgroundFile != null && !backgroundFile.isEmpty() && backgroundFile.getSize() != 0) { - String institute = currentUser().getInstitute(); - String account = currentUser().getAccount(); - ManagedUser currentUser = userMapper.getUser(account, institute); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); String bgPath = "files/background/"+sggCd; @@ -205,10 +199,7 @@ public class StngController extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); //설정 제목 - String institute = currentUser().getInstitute(); - String account = currentUser().getAccount(); - ManagedUser currentUser = userMapper.getUser(account, institute); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); DataObject sgg = statMapper.selectSggByCode(sggCd); String sggNm = sgg.string("NAME"); diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java index ce8c239b..95b54648 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java @@ -95,8 +95,7 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ Crdn crdn = new Crdn(); crdn.setCrdnRegSeCd("07"); crdn.setTaskSeCd(taskSeCd); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); crdn.setSggCd(currentUser.getOrgID()); Map dividedInfo = this.divideInformation(linkFileInfoList, fileGroupType); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java index b8abe080..5d569cae 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -75,7 +75,7 @@ public class Crdn01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); setFetchSize(query); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); List list = crdnStngService.getLinkFileLayoutMetadataList(query); @@ -92,7 +92,7 @@ public class Crdn01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01020-info"); mav.addObject("pageName", "crdn01020"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java index e3134ac1..4a1c0d70 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -91,8 +91,7 @@ public class Crdn02Controller extends ApplicationController { } setFetchSize(query); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java index fa90a708..f6497730 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -73,8 +73,7 @@ public class Crdn03Controller extends ApplicationController { query.setGridType("tagInformationUndefinedData"); setFetchSize(query); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java index e2ee5c37..8052e87e 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -121,8 +121,7 @@ public class Crdn05Controller extends ApplicationController { query.setGridType("todayInsert"); query.setCurrentUserId(currentUser().getId()); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -157,7 +156,7 @@ public class Crdn05Controller extends ApplicationController { String institute = currentUser().getInstitute(); String taskSeCd = hReq.getParameter("taskSeCd"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String deptCd = currentUser.getDeptCode(); String sggCd = currentUser.getOrgID(); @@ -213,7 +212,7 @@ public class Crdn05Controller extends ApplicationController { String institute = currentUser().getInstitute(); String taskSeCd = hReq.getParameter("taskSeCd"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String deptCd = currentUser.getDeptCode(); String sggCd = currentUser.getOrgID(); @@ -260,7 +259,7 @@ public class Crdn05Controller extends ApplicationController { String taskSeCd = hReq.getParameter("taskSeCd"); String institute = currentUser().getInstitute(); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), institute); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String deptCd = currentUser.getDeptCode(); String sggCd = currentUser.getOrgID(); @@ -397,8 +396,7 @@ public class Crdn05Controller extends ApplicationController { String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 2e94e80e..8a506006 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -99,8 +99,7 @@ public class Crdn06Controller extends ApplicationController { public ModelAndView getCrackdownList(CrdnQuery query) { setFetchSize(query); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -267,8 +266,7 @@ public class Crdn06Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn06020-info"); // 법정동 - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd); mav.addObject("stdgNmList", stdgNmList); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java index 821449cd..f83be300 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -71,11 +71,10 @@ public class Crdn07Controller extends ApplicationController { public ModelAndView getTeamList(CrdnQuery query) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); - return setCollectionInfo(new ModelAndView("jsonView"), crdnStngService.getTeamList(query),"",""); + return setCollectionInfo(mav, crdnStngService.getTeamList(query),"",""); } /**비사용 단속팀 목록을 조회한다.
@@ -86,12 +85,11 @@ public class Crdn07Controller extends ApplicationController { public ModelAndView getRemovedTeamList(CrdnQuery query) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); - return setCollectionInfo(new ModelAndView("jsonView"), crdnStngService.getRemovedTeamList(query),"",""); + return setCollectionInfo(mav, crdnStngService.getRemovedTeamList(query),"",""); } /** 단속팀 정보를 삭제한다. @@ -127,8 +125,7 @@ public class Crdn07Controller extends ApplicationController { boolean saved = false; - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); team.setSggCd(sggCd); diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java index d06d07bf..fc8ca521 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -71,8 +71,7 @@ public class Crdn08Controller extends ApplicationController { */ public ModelAndView getExemptionVehicleList(CrdnQuery query) { - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -150,8 +149,7 @@ public class Crdn08Controller extends ApplicationController { public ModelAndView createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); exmptnVhcl.setSggCd(currentUser.getOrgID()); boolean saved = false; @@ -176,8 +174,7 @@ public class Crdn08Controller extends ApplicationController { public ModelAndView updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); exmptnVhcl.setSggCd(currentUser.getOrgID()); boolean saved = false; diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java index eee43001..1e54e85f 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -113,8 +113,7 @@ public class Cvlc01Controller extends ApplicationController { query.setGridType("receiptData"); setFetchSize(query); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -279,8 +278,7 @@ public class Cvlc01Controller extends ApplicationController { mav.addObject("openerPageName", hReq.getParameter("openerPageName")); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd); mav.addObject("stdgNmList", stdgNmList); @@ -333,8 +331,7 @@ public class Cvlc01Controller extends ApplicationController { public ModelAndView saveCivilComplaintProcessSection(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt, Crdn crdn) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); crdn.setSggCd(sggCd); crdnCvlcpt.setSggCd(sggCd); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index b8d9c762..8801d37b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -90,8 +90,7 @@ public class Cvlc02Controller extends ApplicationController { query.setGridType("answerTargetData"); setFetchSize(query); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index 697c0ae6..ff88ba43 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -76,8 +76,7 @@ public class Cvlc03Controller extends ApplicationController { public ModelAndView getCivilComplaintList(CrdnQuery query) { setFetchSize(query); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java index 1f9674cc..550b9cea 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -67,8 +67,7 @@ public class Cvlc04Controller extends ApplicationController { * @return jsonView */ public ModelAndView getDmndDataList(CrdnQuery query) { - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); query.setSggCd(currentUser.getOrgID()); setFetchSize(query); @@ -86,8 +85,7 @@ public class Cvlc04Controller extends ApplicationController { */ public ModelAndView createDmndDataInfo(CrdnCvlcpt crdnCvlcpt) { - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); crdnCvlcpt.setSggCd(currentUser.getOrgID()); boolean saved = false; diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java index ac4eb2da..0931d5d6 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java @@ -71,8 +71,7 @@ public class Cvlc05Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("jsonView"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnQuery.setSggCd(currentSggCd); Map info = crdnCvlcptService.getCvlcptAnswerWordsInfo(crdnQuery); @@ -108,8 +107,7 @@ public class Cvlc05Controller extends ApplicationController { public ModelAndView saveCvlcptAnswerWordsInfo(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt) { boolean saved = false; - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnCvlcpt.setSggCd(currentSggCd); diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java index 503ad75c..13afe096 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java @@ -60,8 +60,7 @@ public class Cvlc06Controller extends ApplicationController { * @return fims/cvlc/cvlc06010-info */ public ModelAndView getWarningWordsList(CrdnQuery crdnQuery) { - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnQuery.setSggCd(currentSggCd); return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getWarningWordsList(crdnQuery),"",""); @@ -78,8 +77,7 @@ public class Cvlc06Controller extends ApplicationController { public ModelAndView saveCvlcptAnswerWordsInfo(CrdnCvlcpt crdnCvlcpt) { boolean saved = false; - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnCvlcpt.setSggCd(currentSggCd); diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java index e7f7ac43..713bd419 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -138,10 +138,7 @@ public class Sprt01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main"); mav.addObject("pageName", "sprt01010"); - String institute = currentUser().getInstitute(); - String account = currentUser().getAccount(); - ManagedUser currentUser = userMapper.getUser(account, institute); - String deptCd = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); diff --git a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java index 9d422f5a..043f7799 100644 --- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java +++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java @@ -60,8 +60,7 @@ public class Stat01Controller extends ApplicationController { public ModelAndView getStatistics(StatQuery statQuery) { ModelAndView mav = new ModelAndView("jsonView"); - //ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - //String curDeptCode = currentUser.getDeptCode(); + //ManagedUser currentUser = (ManagedUser) currentUser().getUser(); //String sggCd = currentUser.getOrgID(); //statQuery.setSggCd(sggCd); @@ -143,8 +142,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01010-main"); mav.addObject("pageName", "stat01010"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = statMapper.selectSggByCode(sggCd); @@ -168,8 +166,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01020-main"); mav.addObject("pageName", "stat01020"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = statMapper.selectSggByCode(sggCd); @@ -194,8 +191,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01030-main"); mav.addObject("pageName", "stat01030"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = statMapper.selectSggByCode(sggCd); @@ -218,8 +214,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01040-main"); mav.addObject("pageName", "stat01040"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = statMapper.selectSggByCode(sggCd); @@ -242,8 +237,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01050-main"); mav.addObject("pageName", "stat01050"); - ManagedUser currentUser = userMapper.getUser(currentUser().getAccount(), currentUser().getInstitute()); - String curDeptCode = currentUser.getDeptCode(); + ManagedUser currentUser = (ManagedUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = statMapper.selectSggByCode(sggCd);