From 8303deed36950df40de150ae3551944545599747 Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 11 Jul 2024 18:15:16 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EB=8C=80=EA=B8=B0=EC=97=85=EC=82=AC?= =?UTF-8?q?=EC=97=85=EC=9E=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8,=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EA=B0=80=EC=9E=85,=ED=9A=8C=EC=9B=90=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EC=88=98=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cokr/xit/fims/base/FimsUser.java | 79 ++++++++ .../xit/fims/base/service/bean/OgdpBean.java | 37 +++- .../xit/fims/base/web/MainController.java | 45 ++++- .../xit/fims/base/web/UserController.java | 57 ++++-- .../xit/fims/cmmn/web/StngController.java | 10 +- .../crdn/service/bean/ImportServiceBean.java | 4 +- .../xit/fims/crdn/web/Crdn01Controller.java | 6 +- .../xit/fims/crdn/web/Crdn02Controller.java | 4 +- .../xit/fims/crdn/web/Crdn03Controller.java | 4 +- .../xit/fims/crdn/web/Crdn05Controller.java | 12 +- .../xit/fims/crdn/web/Crdn06Controller.java | 6 +- .../xit/fims/crdn/web/Crdn07Controller.java | 8 +- .../xit/fims/crdn/web/Crdn08Controller.java | 8 +- .../cvlc/service/bean/CrdnCvlcptMainBean.java | 5 +- .../xit/fims/cvlc/web/Cvlc01Controller.java | 8 +- .../xit/fims/cvlc/web/Cvlc02Controller.java | 4 +- .../xit/fims/cvlc/web/Cvlc03Controller.java | 4 +- .../xit/fims/cvlc/web/Cvlc04Controller.java | 6 +- .../xit/fims/cvlc/web/Cvlc05Controller.java | 9 +- .../xit/fims/cvlc/web/Cvlc06Controller.java | 6 +- .../xit/fims/epst/web/Epst02Controller.java | 14 +- .../xit/fims/excl/web/Excl01Controller.java | 6 +- .../xit/fims/excl/web/Excl02Controller.java | 6 +- .../xit/fims/excl/web/Excl03Controller.java | 6 +- .../xit/fims/levy/service/bean/LevyBean.java | 8 +- .../xit/fims/levy/web/Levy01Controller.java | 10 +- .../xit/fims/levy/web/Levy02Controller.java | 6 +- .../xit/fims/mngt/web/Mngt01Controller.java | 4 +- .../xit/fims/rcvm/web/Rcvm01Controller.java | 6 +- .../xit/fims/rdca/web/Rdca01Controller.java | 6 +- .../xit/fims/sndb/web/Sndb01Controller.java | 38 ++-- .../xit/fims/sprt/web/Sprt01Controller.java | 9 +- .../xit/fims/sprt/web/Sprt04Controller.java | 6 +- .../xit/fims/stat/web/Stat01Controller.java | 14 +- .../sql/mapper/base/department-mapper.xml | 35 +++- .../resources/sql/mapper/base/user-mapper.xml | 79 ++++---- .../WEB-INF/jsp/base/user/user-info.jsp | 145 ++++++++------ .../WEB-INF/jsp/base/user/user-main.jsp | 27 +-- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 2 +- .../WEB-INF/jsp/fims/crdn/crdn08030-info.jsp | 1 - .../WEB-INF/jsp/fims/user/user01010-main.jsp | 172 +++++++++------- src/main/webapp/WEB-INF/jsp/index.jsp | 106 +++++----- src/main/webapp/WEB-INF/jsp/login.jsp | 187 +++++++++++++----- 43 files changed, 764 insertions(+), 451 deletions(-) create mode 100644 src/main/java/cokr/xit/fims/base/FimsUser.java diff --git a/src/main/java/cokr/xit/fims/base/FimsUser.java b/src/main/java/cokr/xit/fims/base/FimsUser.java new file mode 100644 index 00000000..a9a2f090 --- /dev/null +++ b/src/main/java/cokr/xit/fims/base/FimsUser.java @@ -0,0 +1,79 @@ +package cokr.xit.fims.base; + +import cokr.xit.base.user.GenericUser; + +public class FimsUser extends GenericUser { + + private static final long serialVersionUID = 1L; + + @Override + public String getType() { + return "USR00"; + } + + /** + * 직위 이름 + */ + private String positionName; + + /** + * 인증 DN 값 + */ + private String certificateDn; + + /** + * 접속구분코드 + */ + private String cntnSeCd; + + /** + * 사용자구분코드 + */ + private String userSeCd; + + + /**직위이름을 반환한다. + * @return 직위이름 + */ + public String getPositionName() { + return positionName; + } + + /**직위이름을 설정한다. + * @param positionName 직위이름 + */ + public void setPositionName(String positionName) { + this.positionName = positionName; + } + + /**인증 DN값을 반환한다. + * @return 인증 DN값 + */ + public String getCertificateDn() { + return certificateDn; + } + + /**인증 DN값을 설정한다. + * @param certificateDn 인증 DN값 + */ + public void setCertificateDn(String certificateDn) { + this.certificateDn = certificateDn; + } + + public String getCntnSeCd() { + return cntnSeCd; + } + + public void setCntnSeCd(String cntnSeCd) { + this.cntnSeCd = cntnSeCd; + } + + public String getUserSeCd() { + return userSeCd; + } + + public void setUserSeCd(String userSeCd) { + this.userSeCd = userSeCd; + } + +} 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 cdfe7dcd..ffe7da60 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 @@ -43,6 +43,15 @@ public class OgdpBean extends AbstractBean { List ogdpList = new ArrayList<>(); List sggs = sigunguBean.getSigunguList(new SigunguQuery()); for(DataObject sgg : sggs) { + DataObject noDept = new DataObject(); + noDept.put("SGG_CD", sgg.string("SGG_CD")); + noDept.put("SGG_NM", sgg.string("SGG_NM")); + noDept.put("INST_CD", sgg.string("INST_CD")); + noDept.put("INST_NM", sgg.string("INST_NM")); + noDept.put("DEPT_CD", "EMPTY00"); + noDept.put("DEPT_NM", "(부서 없음)"); + ogdpList.add(noDept); + List depts = departmentBean.getDepartmentList(new DepartmentQuery().setSggID(sgg.string("SGG_CD"))); for(DataObject dept : depts) { DataObject ogdp = new DataObject(); @@ -52,8 +61,6 @@ 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("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); } } @@ -64,10 +71,10 @@ public class OgdpBean extends AbstractBean { 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); + + ogdpOutput(ogdpList); return ogdpList; } @@ -81,6 +88,15 @@ public class OgdpBean extends AbstractBean { } List sggs = sigunguBean.getSigunguList(sggQuery); for(DataObject sgg : sggs) { + DataObject noDept = new DataObject(); + noDept.put("SGG_CD", sgg.string("SGG_CD")); + noDept.put("SGG_NM", sgg.string("SGG_NM")); + noDept.put("INST_CD", sgg.string("INST_CD")); + noDept.put("INST_NM", sgg.string("INST_NM")); + noDept.put("DEPT_CD", "EMPTY00"); + noDept.put("DEPT_NM", "(부서 없음)"); + ogdpList.add(noDept); + List depts = departmentBean.getDepartmentList(new DepartmentQuery().setSggID(sgg.string("SGG_CD"))); for(DataObject dept : depts) { DataObject ogdp = new DataObject(); @@ -90,8 +106,6 @@ 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("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); } } @@ -104,13 +118,20 @@ public class OgdpBean extends AbstractBean { 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); } + + ogdpOutput(ogdpList); return ogdpList; } + private void ogdpOutput(List list) { + for(DataObject one : list) { + one.put("OGDP_CD", one.string("SGG_CD")+"/"+one.string("INST_CD") + ":" + one.string("DEPT_CD")); + one.put("OGDP_NM", one.string("SGG_NM") + " / " + one.string("INST_NM") + " : " + one.string("DEPT_NM")); + } + } + public int countUser(String sggCd) { return ogdpMapper.countUser(sggCd); } diff --git a/src/main/java/cokr/xit/fims/base/web/MainController.java b/src/main/java/cokr/xit/fims/base/web/MainController.java index 76907aa4..f392f329 100644 --- a/src/main/java/cokr/xit/fims/base/web/MainController.java +++ b/src/main/java/cokr/xit/fims/base/web/MainController.java @@ -1,6 +1,7 @@ package cokr.xit.fims.base.web; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -12,10 +13,13 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import cokr.xit.base.user.ManagedUser; +import cokr.xit.base.code.CommonCode; +import cokr.xit.base.code.service.CodeService; +import cokr.xit.base.security.access.service.AuthorityService; import cokr.xit.base.user.SigunguQuery; import cokr.xit.base.user.service.SigunguDepartmentService; import cokr.xit.base.user.service.UserService; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.task.TaskRequestMappingHandlerMapping; import cokr.xit.foundation.data.DataObject; @@ -42,6 +46,12 @@ public class MainController extends cokr.xit.base.web.MainController { @Resource(name="sigunguDepartmentService") private SigunguDepartmentService sggDeptService; + @Resource(name="codeService") + private CodeService codeService; + + @Resource(name="authorityService") + private AuthorityService authorityService; + @Override public ModelAndView loginPage() { ModelAndView mav = new ModelAndView("login"); @@ -101,32 +111,51 @@ public class MainController extends cokr.xit.base.web.MainController { } @GetMapping(name="회원가입 페이지", value="/signupPage.do") - public ModelAndView signupPage(String sggCd) { + public ModelAndView signupPage(String sggCd, String cntnSeCd) { ModelAndView mav = new ModelAndView("fims/user/user01010-main"); + mav.addObject("userInfo", "{}"); - mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList()); - List ableOgdpList = ogdpBean.selectAbleOgdpList(true, sggCd); - mav.addObject("ableOgdpList", ableOgdpList); - mav.addObject("userInfo", "{}"); + if(cntnSeCd.equals("01")) { + mav.addObject("cntnSeCd", "01"); + + mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList()); + List ableOgdpList = ogdpBean.selectAbleOgdpList(true, sggCd); + mav.addObject("ableOgdpList", ableOgdpList); + + Map> commonCodes = codeService.getCodesOf("CMN008"); + mav.addObject("CMN008List", commonCodes.get("CMN008")); + + } else if(cntnSeCd.equals("02")) { + List sggs = sggDeptService.getSigunguList(new SigunguQuery().setSggIDs(sggCd)); + + mav.addObject("cntnSeCd", "02"); + mav.addObject("sggCd", sggCd); + mav.addObject("institute", sggs.get(0).string("INST_CD")); + mav.addObject("userSeCd", "21"); + } return mav; } @RequestMapping(name="회원가입", value="/signup.do") - public ModelAndView signup(ManagedUser user) { + public ModelAndView signup(FimsUser user) { ModelAndView mav = new ModelAndView("jsonView"); boolean saved = userService.create(user); + if(user.getUserSeCd() != null && user.getUserSeCd().equals("21")) { + int affected = authorityService.addUsers("ROLE_RENT", user.getId()); + } + mav.addObject("saved",saved); return mav; } @RequestMapping(name="중복 확인", value="/duplicate.do") public ModelAndView isDuplicate(String account, String sggCd) { - ManagedUser user = userService.getUser(account, sggCd); + FimsUser user = userService.getUser(account, sggCd); return new ModelAndView("jsonView") .addObject("duplicate", user != null); } diff --git a/src/main/java/cokr/xit/fims/base/web/UserController.java b/src/main/java/cokr/xit/fims/base/web/UserController.java index 5cd69d90..d904e421 100644 --- a/src/main/java/cokr/xit/fims/base/web/UserController.java +++ b/src/main/java/cokr/xit/fims/base/web/UserController.java @@ -1,6 +1,7 @@ package cokr.xit.fims.base.web; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -9,17 +10,20 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import cokr.xit.base.code.CommonCode; import cokr.xit.base.code.service.CodeQuery; +import cokr.xit.base.code.service.CodeService; import cokr.xit.base.code.service.bean.CodeBean; import cokr.xit.base.security.SecuredUserInfo; -import cokr.xit.base.user.ManagedUser; +import cokr.xit.base.security.access.service.AuthorityService; import cokr.xit.base.user.service.UserService; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.foundation.data.DataObject; @Controller -public class UserController extends cokr.xit.base.user.web.UserController { +public class UserController extends cokr.xit.base.user.web.UserController { @Resource(name="userService") private UserService userService; @@ -27,6 +31,12 @@ public class UserController extends cokr.xit.base.user.web.UserController ableOgdpList = ogdpBean.selectAbleOgdpList(false, currentUser().getOrgID()); mav.addObject("ableOgdpList", ableOgdpList); + Map> commonCodes = codeService.getCodesOf("CMN008"); + mav.addObject("CMN008List", commonCodes.get("CMN008")); + return mav; } @@ -73,8 +86,13 @@ public class UserController extends cokr.xit.base.user.web.UserController { return "ROLE_"+item.string("CODE"); }) .toList().toArray(new String[taskList.size()]); boolean hasTaskAuth = userInfo.hasAuthorities(taskRoles); - - userInfo.getInfo().put("isAdmin", isAdmin); userInfo.getInfo().put("hasTaskAuth", hasTaskAuth); + //사용자별 업무 및 기본업무 stngBean.initUserInfo(userInfo); @@ -118,16 +135,27 @@ public class UserController extends cokr.xit.base.user.web.UserController ableOgdpList = ogdpBean.selectAbleOgdpList(false, currentUser().getOrgID()); - mav.addObject("ableOgdpList", ableOgdpList); + String cntnSeCd = userInfo.string("CNTN_SE_CD"); + if(cntnSeCd.equals("01")) { + mav.addObject("cntnSeCd", "01"); + + mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList()); + List ableOgdpList = ogdpBean.selectAbleOgdpList(false, currentUser().getOrgID()); + mav.addObject("ableOgdpList", ableOgdpList); + + Map> commonCodes = codeService.getCodesOf("CMN008"); + mav.addObject("CMN008List", commonCodes.get("CMN008")); + + } else if(cntnSeCd.equals("02")) { + mav.addObject("cntnSeCd", "02"); + } return mav; } @RequestMapping(name="내 정보 변경", value="/updateMyInfo.do") - public ModelAndView updateMyInfo(ManagedUser user) { + public ModelAndView updateMyInfo(FimsUser user) { return super.update(user); } @@ -161,15 +189,12 @@ public class UserController extends cokr.xit.base.user.web.UserController 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 206983c6..39ec87de 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.ftp.RemoteSystemInfo; import cokr.xit.fims.cmmn.service.bean.StngBean; @@ -83,7 +83,7 @@ public class Crdn01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); setFetchSize(query); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); List list = crdnStngService.getLinkFileLayoutMetadataList(query); @@ -102,7 +102,7 @@ public class Crdn01Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn01020-info"); mav.addObject("pageName", "crdn01020"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 a7a664ec..ffdfeedd 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn02Controller.java @@ -16,9 +16,9 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -98,7 +98,7 @@ public class Crdn02Controller extends ApplicationController { } setFetchSize(query); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 9574e5a0..d3911427 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn03Controller.java @@ -16,9 +16,9 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.crdn.Crdn; @@ -80,7 +80,7 @@ public class Crdn03Controller extends ApplicationController { query.setGridType("tagInformationUndefinedData"); setFetchSize(query); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 c292cc0f..2e91d270 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java @@ -21,9 +21,9 @@ import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.web.FileInfoFactory; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.ftp.FTPUtil; @@ -129,7 +129,7 @@ public class Crdn05Controller extends ApplicationController { query.setGridType("todayInsert"); query.setCurrentUserId(currentUser().getId()); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -168,7 +168,7 @@ public class Crdn05Controller extends ApplicationController { String institute = currentUser().getInstitute(); String taskSeCd = hReq.getParameter("taskSeCd"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String deptCd = currentUser.getDeptCode(); String sggCd = currentUser.getOrgID(); @@ -226,7 +226,7 @@ public class Crdn05Controller extends ApplicationController { String institute = currentUser().getInstitute(); String taskSeCd = hReq.getParameter("taskSeCd"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String deptCd = currentUser.getDeptCode(); String sggCd = currentUser.getOrgID(); @@ -275,7 +275,7 @@ public class Crdn05Controller extends ApplicationController { String taskSeCd = hReq.getParameter("taskSeCd"); String institute = currentUser().getInstitute(); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String deptCd = currentUser.getDeptCode(); String sggCd = currentUser.getOrgID(); @@ -418,7 +418,7 @@ public class Crdn05Controller extends ApplicationController { String urlTaskSeCd = hReq.getServletPath().split("/")[1]; mav.addObject("taskSeCd", urlTaskSeCd); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 0c92459a..77708a7a 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -20,9 +20,9 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -108,7 +108,7 @@ public class Crdn06Controller extends ApplicationController { public ModelAndView getCrackdownList(CrdnQuery query) { setFetchSize(query); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -263,7 +263,7 @@ public class Crdn06Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/crdn/crdn06020-info"); // 법정동 - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 30791869..7298fea8 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn07Controller.java @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.Team; @@ -79,7 +79,7 @@ public class Crdn07Controller extends ApplicationController { public ModelAndView getTeamList(CrdnQuery query) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); return setCollectionInfo(mav, crdnStngService.getTeamList(query),"",""); @@ -95,7 +95,7 @@ public class Crdn07Controller extends ApplicationController { public ModelAndView getRemovedTeamList(CrdnQuery query) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -139,7 +139,7 @@ public class Crdn07Controller extends ApplicationController { boolean saved = false; - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 7e97dc92..483c594d 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn08Controller.java @@ -16,9 +16,9 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; import cokr.xit.fims.crdn.CrdnQuery; @@ -78,7 +78,7 @@ public class Crdn08Controller extends ApplicationController { @RequestMapping(name="면제차량 목록 조회", value=METHOD_URL.getExemptionVehicleList) public ModelAndView getExemptionVehicleList(CrdnQuery query) { - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -156,7 +156,7 @@ public class Crdn08Controller extends ApplicationController { public ModelAndView createExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); exmptnVhcl.setSggCd(currentUser.getOrgID()); boolean saved = false; @@ -183,7 +183,7 @@ public class Crdn08Controller extends ApplicationController { public ModelAndView updateExemptionVehicleInfo(ExmptnVhcl exmptnVhcl) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); exmptnVhcl.setSggCd(currentUser.getOrgID()); boolean saved = false; diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java index 276a62a4..f401e6e3 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import cokr.xit.base.code.dao.CodeMapper; import cokr.xit.base.code.service.CodeQuery; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.dao.CrdnInfoMapper; import cokr.xit.fims.crdn.dao.CrdnInstMapper; @@ -232,7 +232,8 @@ public class CrdnCvlcptMainBean extends AbstractBean { String joinWords = head + "\n\n" + body + "\n\n" + tail; - ManagedUser currentUser = userMapper.getUser(currentUserAcnt, currentSggCd); + DataObject params = new DataObject().set("account", currentUserAcnt).set("orgID", currentSggCd); + FimsUser currentUser = userMapper.getUser(params); String completeWords = this.replaceMacroString(joinWords , currentUser.getPhoneNo(), currentUser.getName()); 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 7f953d77..32c55e8b 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc01Controller.java @@ -22,9 +22,9 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.hwp.format.CvlcptOrgn; @@ -120,7 +120,7 @@ public class Cvlc01Controller extends ApplicationController { query.setGridType("receiptData"); setFetchSize(query); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); query.setSggCd(sggCd); @@ -289,7 +289,7 @@ public class Cvlc01Controller extends ApplicationController { mav.addObject("openerPageName", hReq.getParameter("openerPageName")); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); List stdgNmList = crdnStngMapper.selectStdgNmList(sggCd); mav.addObject("stdgNmList", stdgNmList); @@ -344,7 +344,7 @@ public class Cvlc01Controller extends ApplicationController { public ModelAndView saveCivilComplaintProcessSection(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt, Crdn crdn) { ModelAndView mav = new ModelAndView("jsonView"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 314d319b..d035a75d 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -20,9 +20,9 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -99,7 +99,7 @@ public class Cvlc02Controller extends ApplicationController { query.setGridType("answerTargetData"); setFetchSize(query); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 326174d9..67894004 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -16,9 +16,9 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -86,7 +86,7 @@ public class Cvlc03Controller extends ApplicationController { public ModelAndView getCivilComplaintList(CrdnQuery query) { setFetchSize(query); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 932f1259..ea110ef8 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.crdn.service.CrdnService; @@ -75,7 +75,7 @@ public class Cvlc04Controller extends ApplicationController { @Task @RequestMapping(name="새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList) public ModelAndView getDmndDataList(CrdnQuery query) { - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); query.setSggCd(currentUser.getOrgID()); setFetchSize(query); @@ -95,7 +95,7 @@ public class Cvlc04Controller extends ApplicationController { @RequestMapping(name="새올요청자료 등록", value=METHOD_URL.createDmndDataInfo) public ModelAndView createDmndDataInfo(CrdnCvlcpt crdnCvlcpt) { - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 783a53ae..2ce6c7a2 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc05Controller.java @@ -11,9 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; @@ -61,7 +61,8 @@ public class Cvlc05Controller extends ApplicationController { mav.addObject("pageName", "cvlc05010"); mav.addObject("currentUserName", UserInfo.current().getName()); - ManagedUser currentUser = userMapper.getUser(UserInfo.current().getAccount(), UserInfo.current().getOrgID()); + DataObject params = new DataObject().set("account", UserInfo.current().getAccount()).set("orgID", UserInfo.current().getOrgID()); + FimsUser currentUser = userMapper.getUser(params); mav.addObject("currentUserTelno", currentUser.getPhoneNo()); Map> commonCodes = getCodesOf("FIM054"); @@ -80,7 +81,7 @@ public class Cvlc05Controller extends ApplicationController { ModelAndView mav = new ModelAndView(); mav.setViewName("jsonView"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnQuery.setSggCd(currentSggCd); Map info = crdnCvlcptService.getCvlcptAnswerWordsInfo(crdnQuery); @@ -118,7 +119,7 @@ public class Cvlc05Controller extends ApplicationController { public ModelAndView saveCvlcptAnswerWordsInfo(HttpServletRequest hReq, CrdnCvlcpt crdnCvlcpt) { boolean saved = false; - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) 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 7efa3356..1a9a84cd 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc06Controller.java @@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.CrdnQuery; import cokr.xit.fims.cvlc.CrdnCvlcpt; @@ -68,7 +68,7 @@ public class Cvlc06Controller extends ApplicationController { @Task @RequestMapping(name="계도문 문구 설정 목록", value=METHOD_URL.getWarningWordsList) public ModelAndView getWarningWordsList(CrdnQuery crdnQuery) { - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnQuery.setSggCd(currentSggCd); return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getWarningWordsList(crdnQuery),"",""); @@ -87,7 +87,7 @@ public class Cvlc06Controller extends ApplicationController { public ModelAndView saveCvlcptAnswerWordsInfo(CrdnCvlcpt crdnCvlcpt) { boolean saved = false; - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String currentSggCd = currentUser.getOrgID(); crdnCvlcpt.setSggCd(currentSggCd); diff --git a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java index 3fa22922..8e44c99e 100644 --- a/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java +++ b/src/main/java/cokr/xit/fims/epst/web/Epst02Controller.java @@ -18,8 +18,8 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -97,7 +97,7 @@ public class Epst02Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/epst/epst02010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054"); @@ -106,7 +106,7 @@ public class Epst02Controller extends ApplicationController { .addObject("pageName", "epst02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "epostGdcc") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) @@ -279,7 +279,7 @@ public class Epst02Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/epst/epst02030-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // 부서 정보 DataObject deptInfo = stngBean.getStng("dept"); @@ -290,7 +290,7 @@ public class Epst02Controller extends ApplicationController { .addObject("pageName", "epst02030") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "epostRcptReg") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 @@ -492,7 +492,7 @@ public class Epst02Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/epst/epst02050-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // 부서 정보 DataObject deptInfo = stngBean.getStng("dept"); @@ -503,7 +503,7 @@ public class Epst02Controller extends ApplicationController { .addObject("pageName", "epst02050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "epostRcptRslt") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("deptCd", deptInfo.string("DEPT_CD")) // 부서 코드 7자리 .addObject("conOrg", deptInfo.string("EGP_CON_ORG")) // E그린 외부기관구분코드 diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 9abb4885..3852d820 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -18,8 +18,8 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -73,7 +73,7 @@ public class Excl01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/excl/excl01010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM021", "FIM022", "FIM054"); @@ -84,7 +84,7 @@ public class Excl01Controller extends ApplicationController { .addObject("pageName", "excl01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "levyExcl") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java index 2ee7822c..1f4627f6 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl02Controller.java @@ -24,8 +24,8 @@ import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.service.FileService; import cokr.xit.base.file.web.FileInfoFactory; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.FimsPrintOption; import cokr.xit.fims.cmmn.hwp.format.DlbrDecsnList; @@ -102,7 +102,7 @@ public class Excl02Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/excl/excl02010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM031", "FIM033", "FIM054"); @@ -111,7 +111,7 @@ public class Excl02Controller extends ApplicationController { .addObject("pageName", "excl02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "opnnSbmsn") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) .addObject("FIM031List", commonCodes.get("FIM031")) // 의견 제출 답변 결과(OPNN_SBMSN_STTS_CD) .addObject("FIM033List", commonCodes.get("FIM033")) // 의견제출 구분 코드(OPNN_SBMSN_SE_CD) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java index d8a082a0..3548b956 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl03Controller.java @@ -18,8 +18,8 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -70,7 +70,7 @@ public class Excl03Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/excl/excl03010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054"); @@ -79,7 +79,7 @@ public class Excl03Controller extends ApplicationController { .addObject("pageName", "excl03010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "crdnReReg") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) ; } diff --git a/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java b/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java index 70c11be3..8f011dd4 100644 --- a/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java +++ b/src/main/java/cokr/xit/fims/levy/service/bean/LevyBean.java @@ -6,7 +6,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; -import cokr.xit.base.user.ManagedUser; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.CrdnSttsHstry; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; @@ -164,7 +164,7 @@ public class LevyBean extends AbstractBean { String rtnMsg = ""; // 처리 결과 메시지 // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // 단속 정보 DataObject crdnInfo = levyMapper.selectCrdn(levy.getCrdnId()); @@ -188,8 +188,8 @@ public class LevyBean extends AbstractBean { } // 부과 정보 - levy.setInstCd(managedUser.getInstitute()); // 기관 코드 - levy.setDeptCd(managedUser.getDeptCode()); // 부서 코드 + levy.setInstCd(fimsUser.getInstitute()); // 기관 코드 + levy.setDeptCd(fimsUser.getDeptCode()); // 부서 코드 levy.setSpclBizCd(crdnInfo.string("SPCL_BIZ_CD")); // 특별회계 사업 코드 levy.setFyr(levy.getLevyYmd().substring(0, 4)); // 회계연도 levy.setAcntgSeCd(crdnInfo.string("ACNTG_SE_CD")); // 회계 구분 코드 diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java index d5eb2ce6..654c15e3 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy01Controller.java @@ -18,8 +18,8 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; @@ -77,7 +77,7 @@ public class Levy01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/levy/levy01010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064"); @@ -88,7 +88,7 @@ public class Levy01Controller extends ApplicationController { .addObject("pageName", "levy01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "rductLevyTrgt") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) ; } @@ -228,7 +228,7 @@ public class Levy01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/levy/levy01050-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM010", "FIM046", "FIM054"); @@ -237,7 +237,7 @@ public class Levy01Controller extends ApplicationController { .addObject("pageName", "levy01050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "levy") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) .addObject("FIM010List", commonCodes.get("FIM010")) // 단속 상태 코드(CRDN_STTS_CD) .addObject("FIM046List", commonCodes.get("FIM046")) // 감경 구분 코드(RDUCT_SE_CD) diff --git a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java index b0c1e7da..440b7b34 100644 --- a/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java +++ b/src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java @@ -18,9 +18,9 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -77,7 +77,7 @@ public class Levy02Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/levy/levy02010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054"); @@ -86,7 +86,7 @@ public class Levy02Controller extends ApplicationController { .addObject("pageName", "levy02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "rduct") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 업무 구분 코드(TASK_SE_CD) .addObject("FIM019List", commonCodes.get("FIM019")) // 감경 사유 구분 코드(RDUCT_RSN_CD) ; diff --git a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java index 452276b3..a11284b5 100644 --- a/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java +++ b/src/main/java/cokr/xit/fims/mngt/web/Mngt01Controller.java @@ -8,10 +8,10 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.SigunguQuery; import cokr.xit.base.user.service.SigunguDepartmentService; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.mngt.Ntc; import cokr.xit.fims.mngt.NtcQuery; import cokr.xit.fims.mngt.service.NtcService; @@ -73,7 +73,7 @@ public class Mngt01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); setFetchSize(req); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); req.setSggCd(sggCd); List list = ntcService.getNtcList(req); diff --git a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java index eacc5c50..94dc5520 100644 --- a/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java +++ b/src/main/java/cokr/xit/fims/rcvm/web/Rcvm01Controller.java @@ -18,8 +18,8 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -74,7 +74,7 @@ public class Rcvm01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/rcvm/rcvm01010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM041", "FIM045", "FIM054"); @@ -83,7 +83,7 @@ public class Rcvm01Controller extends ApplicationController { .addObject("pageName", "rcvm01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "rcvmt") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("FIM041List", commonCodes.get("FIM041")) // 수납 구분 코드(RCVMT_SE_CD) .addObject("FIM045List", commonCodes.get("FIM045")) // 납부 방법 구분 코드(PAY_MTHD_SE_CD) diff --git a/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java b/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java index 50afa582..e8cd019f 100644 --- a/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java +++ b/src/main/java/cokr/xit/fims/rdca/web/Rdca01Controller.java @@ -15,8 +15,8 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -65,7 +65,7 @@ public class Rdca01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/rdca/rdca01010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM021", "FIM022", "FIM054", "FIM085"); @@ -75,7 +75,7 @@ public class Rdca01Controller extends ApplicationController { return mav .addObject("pageName", "rdca01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "rdcamt") // prefix - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) diff --git a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java index 9b7ebd1b..354b7d4a 100644 --- a/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java +++ b/src/main/java/cokr/xit/fims/sndb/web/Sndb01Controller.java @@ -22,8 +22,8 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.CmmnQuery; import cokr.xit.fims.cmmn.FimsPrintOption; @@ -186,7 +186,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM022", "FIM054", "FIM061", "FIM064"); @@ -198,7 +198,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "wrngTrgt") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_ID) @@ -341,7 +341,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01030-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054", "FIM067"); @@ -350,7 +350,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01030") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "wrngSndng") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) ; @@ -518,7 +518,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01050-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064"); @@ -529,7 +529,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01050") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "advntceTrgt") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_CD) .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_CD) @@ -675,7 +675,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01070-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054", "FIM067"); @@ -684,7 +684,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01070") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "advntceSndng") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) ; @@ -859,7 +859,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01090-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM054", "FIM061", "FIM064"); @@ -870,7 +870,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01090") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "nhtTrgt") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_CD) .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_CD) @@ -1057,7 +1057,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01110-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054", "FIM067"); @@ -1068,7 +1068,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01110") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "nhtSndng") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) .addObject("FIM067List", commonCodes.get("FIM067")) // 발송 등록 구분 코드(SNDNG_REG_SE_CD) @@ -1465,7 +1465,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01220-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM004", "FIM005", "FIM006", "FIM047", "FIM054", "FIM061", "FIM064", "FIM081"); @@ -1476,7 +1476,7 @@ public class Sndb01Controller extends ApplicationController { .addObject("pageName", "sndb01220") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "sndbk") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM004List", commonCodes.get("FIM004")) // 주정차위반 내역 코드(VLTN_ID) .addObject("FIM005List", commonCodes.get("FIM005")) // 전용차로위반 내역 코드(VLTN_ID) @@ -1609,7 +1609,7 @@ public class Sndb01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sndb/sndb01240-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM047", "FIM054"); @@ -1617,7 +1617,7 @@ public class Sndb01Controller extends ApplicationController { return mav.addObject("pageName", "sndb01240") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "svbtc") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) // 시군구에서 사용하는 업무 목록 .addObject("FIM047List", commonCodes.get("FIM047")) // 발송 구분 코드(SNDNG_SE_CD) ; @@ -2119,7 +2119,7 @@ public class Sndb01Controller extends ApplicationController { } - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); OutsourcingStngQuery stngQuery = new OutsourcingStngQuery(); @@ -2289,7 +2289,7 @@ public class Sndb01Controller extends ApplicationController { } } - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); OutsourcingStngQuery stngQuery = new OutsourcingStngQuery(); 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 16595a1d..09df05f1 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt01Controller.java @@ -24,9 +24,9 @@ import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.base.service.bean.OgdpBean; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.FimsPrintOption; @@ -151,7 +151,7 @@ public class Sprt01Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sprt/sprt01010-main"); mav.addObject("pageName", "sprt01010"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); @@ -188,6 +188,7 @@ public class Sprt01Controller extends ApplicationController { this.makeIntegrationSearchQuery(query, req); List list = integrationSearchService.getIntegrationDataList(query); + List upList = list.stream().filter(item -> item.string("RCVMT_ETC_YN").equals("N")).toList(); List downList = list.stream().filter(item -> item.string("RCVMT_ETC_YN").equals("Y")).toList(); @@ -847,7 +848,7 @@ public class Sprt01Controller extends ApplicationController { } - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); OutsourcingStngQuery stngQuery = new OutsourcingStngQuery(); @@ -1087,7 +1088,7 @@ public class Sprt01Controller extends ApplicationController { } - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); OutsourcingStngQuery stngQuery = new OutsourcingStngQuery(); diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java index 1431aa95..4de2eac4 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt04Controller.java @@ -18,8 +18,8 @@ import cokr.xit.base.docs.xls.CellDef; import cokr.xit.base.docs.xls.Format; import cokr.xit.base.docs.xls.Style; import cokr.xit.base.docs.xls.XLSWriter; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.cmmn.xls.FormatMaker; import cokr.xit.fims.cmmn.xls.StyleMaker; @@ -73,7 +73,7 @@ public class Sprt04Controller extends ApplicationController { ModelAndView mav = new ModelAndView("fims/sprt/sprt04010-main"); // 사용자 정보 - ManagedUser managedUser = (ManagedUser)currentUser().getUser(); + FimsUser fimsUser = (FimsUser)currentUser().getUser(); // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM054"); @@ -81,7 +81,7 @@ public class Sprt04Controller extends ApplicationController { return mav.addObject("pageName", "sprt04010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("infoPrefix", "cvlcptDscsn") // prefix .addObject("infoPrefixUrl", CLASS_URL) // prefixUrl - .addObject("sggCd", managedUser.getOrgID()) // 시군구 코드(SGG_CD) + .addObject("sggCd", fimsUser.getOrgID()) // 시군구 코드(SGG_CD) .addObject("taskListForSgg", stngBean.filterTaskSectionCodeForSgg(commonCodes.get("FIM054"))) ; } 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 d1c4cce7..5a306966 100644 --- a/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java +++ b/src/main/java/cokr/xit/fims/stat/web/Stat01Controller.java @@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.base.code.CommonCode; -import cokr.xit.base.user.ManagedUser; import cokr.xit.base.user.SigunguQuery; import cokr.xit.base.user.dao.UserMapper; import cokr.xit.base.user.service.bean.SigunguBean; import cokr.xit.base.web.ApplicationController; +import cokr.xit.fims.base.FimsUser; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.stat.CodeSubsetInfo; import cokr.xit.fims.stat.GroupInfo; @@ -66,7 +66,7 @@ public class Stat01Controller extends ApplicationController { public ModelAndView getStatistics(StatQuery statQuery) { ModelAndView mav = new ModelAndView("jsonView"); - //ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + //FimsUser currentUser = (FimsUser) currentUser().getUser(); //String sggCd = currentUser.getOrgID(); //statQuery.setSggCd(sggCd); @@ -149,7 +149,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01010-main"); mav.addObject("pageName", "stat01010"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0); @@ -174,7 +174,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01020-main"); mav.addObject("pageName", "stat01020"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0); @@ -200,7 +200,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01030-main"); mav.addObject("pageName", "stat01030"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0); @@ -224,7 +224,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01040-main"); mav.addObject("pageName", "stat01040"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0); @@ -248,7 +248,7 @@ public class Stat01Controller extends ApplicationController { mav.setViewName("fims/stat/stat01050-main"); mav.addObject("pageName", "stat01050"); - ManagedUser currentUser = (ManagedUser) currentUser().getUser(); + FimsUser currentUser = (FimsUser) currentUser().getUser(); String sggCd = currentUser.getOrgID(); mav.addObject("sggCd", sggCd); DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0); diff --git a/src/main/resources/sql/mapper/base/department-mapper.xml b/src/main/resources/sql/mapper/base/department-mapper.xml index 799fab61..fa8fab9c 100644 --- a/src/main/resources/sql/mapper/base/department-mapper.xml +++ b/src/main/resources/sql/mapper/base/department-mapper.xml @@ -52,13 +52,36 @@ AND DEPT_CD IN (#{deptID}) -SELECT A.SGG_CD, SGG_NM, A.INST_CD, INST_NM, DEPT_CD, DEPT_NM - FROM TB_SGG A LEFT OUTER JOIN TB_DEPT B - ON A.SGG_CD = B.SGG_CD AND A.INST_CD = B.INST_CD - AND A.USE_YN = 'Y' AND B.USE_YN = 'Y' + +SELECT A.SGG_CD + , SGG_NM + , A.INST_CD + , INST_NM + , DEPT_CD + , DEPT_NM + FROM TB_SGG A + LEFT OUTER JOIN TB_DEPT B + ON A.SGG_CD = B.SGG_CD + AND A.INST_CD = B.INST_CD + AND A.USE_YN = 'Y' + AND B.USE_YN = 'Y' + - + + SELECT SGG_CD, SGG_NM, INST_CD, INST_NM, 'EMPTY00', '(부서 없음)' + FROM TB_SGG + WHERE USE_YN = 'Y' + + + + SELECT 'ADMIN', '관리자 시군구', 'ADMIN00', '관리자 기관', 'ADMIN00', '관리자 부서' + FROM DUAL + + + /* 부서 정보 등록(departmentMapper.insert) */ INSERT INTO TB_DEPT ( diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml index 00a9ad46..c27ee498 100644 --- a/src/main/resources/sql/mapper/base/user-mapper.xml +++ b/src/main/resources/sql/mapper/base/user-mapper.xml @@ -3,18 +3,13 @@ - + - - - - - @@ -25,8 +20,10 @@ - + + + @@ -44,13 +41,12 @@ SELECT A.USER_ID , A.USER_ACNT , A.USER_NM + , A.USER_SE_CD + , GET_CODE_NM('CMN008', A.USER_SE_CD) AS USER_SE_NM + , A.CNTN_SE_CD + , GET_CODE_NM('CMN009', A.CNTN_SE_CD) AS CNTN_SE_NM , A.PASSWD_HINT , A.PASSWD_NSR - , A.EMP_NO - , A.RSDNT_NO - , A.GENDER - , A.BRDT - , A.AREA_NO , A.ZIP , A.ADDR , A.DADDR @@ -69,16 +65,20 @@ 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 = 'ADMIN00' THEN '관리자 기관' ELSE B.INST_NM END) AS INST_NM + , B.INST_NM AS INST_NM , A.DEPT_CD AS DEPT_CD - , (CASE WHEN A.DEPT_CD = 'ADMIN00' THEN '관리자 부서' ELSE B.DEPT_NM END) AS DEPT_NM + , B.DEPT_NM AS DEPT_NM , A.ORG_ID AS ORG_ID , A.ORG_ID AS SGG_CD , B.SGG_NM AS SGG_NM FROM TB_USER A LEFT OUTER JOIN ( - ) B ON A.NSTT_CD = B.INST_CD AND A.DEPT_CD = B.DEPT_CD + UNION + + UNION + + ) B ON A.NSTT_CD = B.INST_CD AND A.DEPT_CD = B.DEPT_CD AND ${by} LIKE CONCAT('%', #{term}, '%') USER_ID IN (#{userID}) @@ -102,20 +102,19 @@ SELECT A.USER_ID SELECT USER_ID , USER_ACNT , USER_NM + , USER_SE_CD + , GET_CODE_NM('CMN008', USER_SE_CD) AS USER_SE_NM + , CNTN_SE_CD + , GET_CODE_NM('CMN009', CNTN_SE_CD) AS CNTN_SE_NM , PASSWD , PASSWD_HINT , PASSWD_NSR - , EMP_NO - , RSDNT_NO - , GENDER - , BRDT , TELNO , MBL_TELNO , FXNO , ZIP , ADDR , DADDR - , AREA_NO , EML_ADRS , ORG_ID , GRP_ID @@ -138,26 +137,27 @@ SELECT USER_ID AND USER_ACNT = #{account} AND NSTT_CD = #{institute} AND ORG_ID = #{orgID} +AND CNTN_SE_CD = #{cntnSeCd} - + SELECT LPAD(NVL(MAX(USER_ID) + 1, 1), 10, '0') NEW_ID FROM TB_USER /* 사용자 정보 등록(userMapper.insertUser) */ INSERT INTO TB_USER ( USER_ID + , ORG_ID + , NSTT_CD + , DEPT_CD + , CNTN_SE_CD + , USER_SE_CD , USER_ACNT , USER_NM , PASSWD , PASSWD_HINT , PASSWD_NSR - , EMP_NO - , RSDNT_NO - , GENDER - , BRDT - , AREA_NO , ZIP , ADDR , DADDR @@ -167,9 +167,6 @@ INSERT INTO TB_USER ( , EML_ADRS , POS_NM , GRP_ID - , ORG_ID - , NSTT_CD - , DEPT_CD , CRTFC_DN , LOCK_YN , LOCK_CNT @@ -182,16 +179,16 @@ INSERT INTO TB_USER ( , STTS ) VALUES ( #{id} + , #{orgID} + , #{institute} + , #{deptCode} + , #{cntnSeCd} + , #{userSeCd} , #{account} , #{name} , #{password} , #{passwordHint} , #{passwordHintAnswer} - , #{empNo} - , #{residentRegNo} - , #{gender} - , #{birthday} - , #{areaNo} , #{zipCode} , #{address} , #{addressDetail} @@ -201,9 +198,6 @@ INSERT INTO TB_USER ( , #{emailAddress} , #{positionName} , #{groupID} - , #{orgID} - , #{institute} - , #{deptCode} , #{certificateDn} , 'N' , 0 @@ -217,17 +211,12 @@ INSERT INTO TB_USER ( ) - + /* 사용자 정보 수정(userMapper.updateUser) */ -UPDATE TB_USER SET - USER_NM = #{name} +UPDATE TB_USER + SET USER_SE_CD = #{userSeCd} , PASSWD_HINT = #{passwordHint} , PASSWD_NSR = #{passwordHintAnswer} - , EMP_NO = #{empNo} - , RSDNT_NO = #{residentRegNo} - , GENDER = #{gender} - , BRDT = #{birthday} - , AREA_NO = #{areaNo} , ZIP = #{zipCode} , ADDR = #{address} , DADDR = #{addressDetail} 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 2f3ccb10..32ae6104 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 @@ -1,7 +1,23 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
+ +
+
+
+ +
+ +
+
+
+
+
- -
-
- -
- - -
-
-
+ +
+
+ +
+ + +
+
+
- +
@@ -81,35 +97,6 @@
-
-
- -
- -
-
-
-
-
- -
- -
- - -
-
- - -
- -
-
-