임대기업사업자 로그인,회원가입,회원정보수정 추가

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;
+	}
+
+}

src/main/java/cokr/xit/fims/base/service/bean/OgdpBean.java

@@ -43,6 +43,15 @@ public class OgdpBean extends AbstractBean {
 		List<DataObject> ogdpList = new ArrayList<>();
 		List<DataObject> 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<DataObject> 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<DataObject> 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<DataObject> 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<DataObject> 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);
 	}

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());
 
+
+		if(cntnSeCd.equals("01")) {
+			mav.addObject("cntnSeCd", "01");
+
+			mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList());
 			List<DataObject> ableOgdpList =  ogdpBean.selectAbleOgdpList(true, sggCd);
 			mav.addObject("ableOgdpList", ableOgdpList);
 
-		mav.addObject("userInfo", "{}");
+			Map<String, List<CommonCode>> commonCodes = codeService.getCodesOf("CMN008");
+			mav.addObject("CMN008List", commonCodes.get("CMN008"));
+
+		} else if(cntnSeCd.equals("02")) {
+			List<DataObject> 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);
 	}

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<ManagedUser> {
+public class UserController extends cokr.xit.base.user.web.UserController<FimsUser> {
 
 	@Resource(name="userService")
 	private UserService userService;
@@ -27,6 +31,12 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 	@Resource(name = "codeBean")
 	private CodeBean codeBean;
 
+	@Resource(name="codeService")
+	private CodeService codeService;
+
+	@Resource(name="authorityService")
+	private AuthorityService authorityService;
+
 	@Resource(name="ogdpBean")
 	private OgdpBean ogdpBean;
 
@@ -61,6 +71,9 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 		List<DataObject> ableOgdpList =  ogdpBean.selectAbleOgdpList(false, currentUser().getOrgID());
 		mav.addObject("ableOgdpList", ableOgdpList);
 
+		Map<String, List<CommonCode>> 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<Manage
 		//시군구,기관,부서
 		ogdpBean.initUserInfo(userInfo);
 
-		//관리자여부,업무권한여부
+		//관리자여부,내부망사용자여부,업무권한여부
 		boolean isAdmin = userInfo.hasAuthorities("ROLE_ADMIN");
+		userInfo.getInfo().put("isAdmin", isAdmin);
+
+		FimsUser fimsUser = (FimsUser)userInfo.getUser();
+		boolean isPublicOfficer = fimsUser.getCntnSeCd().equals("01");
+		userInfo.getInfo().put("isPublicOfficer", isPublicOfficer);
 
 		CodeQuery codeQuery = new CodeQuery();
 		codeQuery.setGroupIDs("FIM054");
@@ -82,10 +100,9 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 		String[] taskRoles = taskList.stream().map((item) -> { 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<Manage
 		DataObject userInfo = userService.getUserInfo(currentUser().getId());
 		mav.addObject("userInfo", toJson(userInfo));
 
-		mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList());
 
+		String cntnSeCd = userInfo.string("CNTN_SE_CD");
+		if(cntnSeCd.equals("01")) {
+			mav.addObject("cntnSeCd", "01");
+
+			mav.addObject("allOgdpList", ogdpBean.selectAllOgdpList());
 			List<DataObject> ableOgdpList =  ogdpBean.selectAbleOgdpList(false, currentUser().getOrgID());
 			mav.addObject("ableOgdpList", ableOgdpList);
 
+			Map<String, List<CommonCode>> 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<Manage
 		return mav;
 	}
 
-
-
-
 	@RequestMapping(name="사용자 검색",value="/user02/010/main.do")
 	public ModelAndView findUserMain(HttpServletRequest hReq, String callbackFuncName) {
 		ModelAndView mav = new ModelAndView("fims/user/user02010-main");
 
 		// 사용자 정보
-		ManagedUser managedUser = (ManagedUser)currentUser().getUser();
+		FimsUser currentUser = (FimsUser)currentUser().getUser();
 
 		return mav
 				.addObject("openerPageName", hReq.getParameter("openerPageName"))	// 호출한 Jsp PageName
@@ -177,9 +202,9 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 				.addObject("infoPrefix", "user")									// prefix
 				.addObject("infoPrefixUrl", "/user/user02")							// prefixUrl
 				.addObject("callbackFuncName", callbackFuncName)					// 콜백함수(callbackFuncName)
-				.addObject("sggCd", managedUser.getOrgID())							// 시군구 코드(SGG_CD)
+				.addObject("sggCd", currentUser.getOrgID())							// 시군구 코드(SGG_CD)
-				.addObject("deptCd", managedUser.getDeptCode())						// 부서 코드(DEPT_CD)
+				.addObject("deptCd", currentUser.getDeptCode())						// 부서 코드(DEPT_CD)
-				.addObject("userAcnt", managedUser.getAccount())					// 사용자 계정(USER_ACNT)
+				.addObject("userAcnt", currentUser.getAccount())					// 사용자 계정(USER_ACNT)
 		;
 	}
 

src/main/java/cokr/xit/fims/cmmn/web/StngController.java

@@ -13,11 +13,11 @@ import org.springframework.web.multipart.MultipartFile;
 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.ExtrForm;
 import cokr.xit.fims.cmmn.ExtrStngQuery;
 import cokr.xit.fims.cmmn.OtptForm;
@@ -111,7 +111,7 @@ public class StngController extends ApplicationController {
 		ModelAndView mav = new ModelAndView("jsonView");
 
 		//출력 설정 제목
-		ManagedUser currentUser = (ManagedUser) currentUser().getUser();
+		FimsUser currentUser = (FimsUser) currentUser().getUser();
 		String sggCd = currentUser.getOrgID();
 		DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0);
 		String sggNm = sgg.string("SGG_NM");
@@ -155,7 +155,7 @@ public class StngController extends ApplicationController {
 		boolean saved = false;
 
 		if(backgroundFile != null && !backgroundFile.isEmpty() && backgroundFile.getSize() != 0) {
-			ManagedUser currentUser = (ManagedUser) currentUser().getUser();
+			FimsUser currentUser = (FimsUser) currentUser().getUser();
 			String sggCd = currentUser.getOrgID();
 
 			String bgPath = "files/attachment/etc/background/"+sggCd;
@@ -222,7 +222,7 @@ public class StngController extends ApplicationController {
 		ModelAndView mav = new ModelAndView("jsonView");
 
 		//설정 제목
-		ManagedUser currentUser = (ManagedUser) currentUser().getUser();
+		FimsUser currentUser = (FimsUser) currentUser().getUser();
 		String sggCd = currentUser.getOrgID();
 		DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0);
 		String sggNm = sgg.string("SGG_NM");
@@ -309,7 +309,7 @@ public class StngController extends ApplicationController {
 		ModelAndView mav = new ModelAndView("jsonView");
 
 		//설정 제목
-		ManagedUser currentUser = (ManagedUser) currentUser().getUser();
+		FimsUser currentUser = (FimsUser) currentUser().getUser();
 		String sggCd = currentUser.getOrgID();
 		DataObject sgg = sigunguBean.getSigunguList(new SigunguQuery().setSggIDs(sggCd)).get(0);
 		String sggNm = sgg.string("SGG_NM");

src/main/java/cokr/xit/fims/crdn/service/bean/ImportServiceBean.java

@@ -17,8 +17,8 @@ import org.springframework.stereotype.Service;
 import cokr.xit.base.file.FileInfo;
 import cokr.xit.base.file.service.bean.FileBean;
 import cokr.xit.base.file.web.FileInfoFactory;
-import cokr.xit.base.user.ManagedUser;
 import cokr.xit.base.user.dao.UserMapper;
+import cokr.xit.fims.base.FimsUser;
 import cokr.xit.fims.cmmn.CmmnUtil;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.Team;
@@ -95,7 +95,7 @@ public class ImportServiceBean extends AbstractServiceBean implements ImportServ
 		Crdn crdn = new Crdn();
 		crdn.setCrdnRegSeCd("07");
 		crdn.setTaskSeCd(taskSeCd);
-		ManagedUser currentUser = (ManagedUser) currentUser().getUser();
+		FimsUser currentUser = (FimsUser) currentUser().getUser();
 		crdn.setSggCd(currentUser.getOrgID());
 		Map<String, Object> dividedInfo = this.divideInformation(linkFileInfoList, fileGroupType);
 

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<DataObject> 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);
 

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);
 

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);
 

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<String> stdgNmList = crdnStngMapper.selectStdgNmList(sggCd);

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<String> stdgNmList = crdnStngMapper.selectStdgNmList(sggCd);
 		mav.addObject("stdgNmList", stdgNmList);

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);
 

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;

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());
 

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<String> 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);

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);
 

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);
 

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;

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<String, List<CommonCode>> 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<String, Object> 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);
 

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);
 

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<String, List<CommonCode>> 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그린 외부기관구분코드

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<String, List<CommonCode>> 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)

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<String, List<CommonCode>> 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)

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<String, List<CommonCode>> 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)
 		;
 	}

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.setInstCd(fimsUser.getInstitute());								// 기관 코드
-		levy.setDeptCd(managedUser.getDeptCode());								// 부서 코드
+		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"));						// 회계 구분 코드

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<String, List<CommonCode>> 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<String, List<CommonCode>> 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)

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<String, List<CommonCode>> 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)
 		;

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<DataObject> list = ntcService.getNtcList(req);

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<String, List<CommonCode>> 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)

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<String, List<CommonCode>> 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)

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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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<String, List<CommonCode>> 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();

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<DataObject> list = integrationSearchService.getIntegrationDataList(query);
+
 		List<DataObject> upList = list.stream().filter(item -> item.string("RCVMT_ETC_YN").equals("N")).toList();
 		List<DataObject> 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();

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<String, List<CommonCode>> 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")))
 		;
 	}

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);

src/main/resources/sql/mapper/base/department-mapper.xml

@@ -52,13 +52,36 @@
   <if test="deptIDs != null">AND DEPT_CD IN (<foreach collection="deptIDs" item="deptID" separator=",">#{deptID}</foreach>)</if>
 <include refid="utility.orderBy" /></select>
 
-<sql id="sggDepts">SELECT A.SGG_CD, SGG_NM, A.INST_CD, INST_NM, DEPT_CD, DEPT_NM
+<sql id="sggDepts">
-  FROM TB_SGG A LEFT OUTER JOIN TB_DEPT B
+SELECT A.SGG_CD
-    ON A.SGG_CD = B.SGG_CD AND A.INST_CD = B.INST_CD
+     , SGG_NM
-   AND A.USE_YN = 'Y' AND B.USE_YN = 'Y'</sql>
+     , 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'
+</sql>
 
-<select id="selectSggDepts" resultType="dataobject"><include refid="sggDepts" />
+<sql id="emptyDept">
- ORDER BY A.SGG_CD, A.INST_CD, DEPT_CD</select>
+  SELECT SGG_CD, SGG_NM, INST_CD, INST_NM, 'EMPTY00', '(부서 없음)'
+    FROM TB_SGG
+   WHERE USE_YN = 'Y'
+</sql>
+
+<sql id="adminSggDept">
+  SELECT 'ADMIN', '관리자 시군구', 'ADMIN00', '관리자 기관', 'ADMIN00', '관리자 부서'
+    FROM DUAL
+</sql>
+
+<select id="selectSggDepts" resultType="dataobject">
+<include refid="sggDepts" />
+ ORDER BY A.SGG_CD, A.INST_CD, DEPT_CD
+</select>
 
 <insert id="insert" parameterType="cokr.xit.base.user.Department">/* 부서 정보 등록(departmentMapper.insert) */
 INSERT INTO TB_DEPT (

src/main/resources/sql/mapper/base/user-mapper.xml

@@ -3,18 +3,13 @@
 <!-- 업무 사용자 -->
 <mapper namespace="cokr.xit.base.user.dao.UserMapper">
 
-<resultMap id="userRow" type="cokr.xit.base.user.ManagedUser">
+<resultMap id="userRow" type="cokr.xit.fims.base.FimsUser">
 	<result property="id"                 column="USER_ID"/>
 	<result property="account"            column="USER_ACNT"/>
 	<result property="name"               column="USER_NM"/>
 	<result property="password"           column="PASSWD"/>
 	<result property="passwordHint"       column="PASSWD_HINT"/>
 	<result property="passwordHintAnswer" column="PASSWD_NSR"/>
-	<result property="empNo"              column="EMP_NO"/>
-	<result property="residentRegNo"      column="RSDNT_NO"/>
-	<result property="gender"             column="GENDER"/>
-	<result property="birthday"           column="BRDT"/>
-	<result property="areaNo"             column="AREA_NO"/>
 	<result property="zipCode"            column="ZIP"/>
 	<result property="address"            column="ADDR"/>
 	<result property="addressDetail"      column="DADDR"/>
@@ -25,8 +20,10 @@
 	<result property="positionName"       column="POS_NM"/>
 	<result property="groupID"            column="GRP_ID"/>
 	<result property="orgID"              column="ORG_ID"/>
-	<result property="deptCode"           column="DEPT_CD"/>
 	<result property="institute"          column="NSTT_CD"/>
+	<result property="deptCode"           column="DEPT_CD"/>
+	<result property="cntnSeCd"           column="CNTN_SE_CD"/>
+	<result property="userSeCd"           column="USER_SE_CD"/>
 	<result property="certificateDn"      column="CRTFC_DN"/>
 	<result property="locked"             column="LOCK_YN"/>
 	<result property="lockCount"          column="LOCK_CNT"/>
@@ -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,15 +65,19 @@ 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 (
   <include refid="cokr.xit.base.user.dao.DepartmentMapper.sggDepts" />
+  UNION
+  <include refid="cokr.xit.base.user.dao.DepartmentMapper.emptyDept" />
+  UNION
+  <include refid="cokr.xit.base.user.dao.DepartmentMapper.adminSggDept" />
   ) B ON A.NSTT_CD = B.INST_CD AND A.DEPT_CD = B.DEPT_CD 
 <where>
 	<if test="by != null and term != null">AND ${by} LIKE CONCAT('%', #{term}, '%')</if>
@@ -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
 <if test="account != null">AND USER_ACNT = #{account}</if>
 <if test="institute != null">AND NSTT_CD = #{institute}</if>
 <if test="orgID != null">AND ORG_ID = #{orgID}</if>
+<if test="cntnSeCd != null">AND CNTN_SE_CD = #{cntnSeCd}</if>
 </where>
 </select>
 
-<insert id="insertUser" parameterType="cokr.xit.base.user.ManagedUser">
+<insert id="insertUser" parameterType="cokr.xit.fims.base.FimsUser">
 <selectKey resultType="string" keyProperty="id" keyColumn="NEW_ID" order="BEFORE">
 SELECT LPAD(NVL(MAX(USER_ID) + 1, 1), 10, '0') NEW_ID FROM TB_USER
 </selectKey>
 /* 사용자 정보 등록(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 (
 )
 </insert>
 
-<update id="updateUser" parameterType="cokr.xit.base.user.ManagedUser">
+<update id="updateUser" parameterType="cokr.xit.fims.base.FimsUser">
 /* 사용자 정보 수정(userMapper.updateUser) */
-UPDATE TB_USER SET
+UPDATE TB_USER 
-       USER_NM = #{name}
+   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}

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"%>
 <form id="infoPrefix-form">
+	<input type="hidden" name="cntnSeCd" data-map="CNTN_SE_CD" />
+
 	<div class="row g-3">
+		<div class="col-md-6">
+			<div class="row">
+				<label class="col-sm-3 text-sm-end col-form-label required">
+				사용자구분
+				</label>
+				<div class="col-sm-9">
+					<select name="userSeCd" class="form-select" data-map="USER_SE_CD" 
+						required title="사용자구분">
+					</select>
+				</div>
+			</div>
+		</div>
+		<div class="col-md-6">
+		</div>
 		<div class="col-md-12">
 			<label class="col-form-label required">
 			시군구/기관 및 부서
@@ -24,6 +40,7 @@
                      
 			<div class="dropdown d-inline-flex">
 				<button type="button" 
+					id="btnSelectOgdp"
 					class="btn btn-md btn-secondary dropdown-toggle"
 					data-bs-toggle="dropdown"
 				>선택</button>
@@ -43,8 +60,7 @@
 		<div class="col-md-6">
 			<div class="row">
 				<label class="col-sm-3 col-form-label text-sm-end required" for="account"
-                        >계정</label
+				>계정</label>
-                      >
 				<div class="col-sm-9">
 					<input name="id" type="hidden" data-map="USER_ID" />
 					<input name="account" type="text" required data-map="USER_ACNT" class="form-control" placeholder="prefixName 계정" />
@@ -81,35 +97,6 @@
                       </div>
                     </div>
                   </div>
-                  <div class="col-md-6">
-                    <div class="row">
-                      <label class="col-sm-3 col-form-label text-sm-end" for="birthday"
-                        >생년월일</label
-                      >
-                      <div class="col-sm-9">
-                        <input name="birthday" type="text" data-map="BRDT" class="form-control dob-picker" placeholder="YYYY-MM-DD"/>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="col-md-6">
-                    <div class="row">
-                      <label class="col-sm-3 col-form-label text-sm-end" for="gender"
-                        >성별</label
-                      >
-                      <div class="col-sm-9">
-                      	<span class="d-inline-flex flex-wrap w-100 h-100 align-content-center">
-                      		<div class="form-check form-check-inline">
-							  <input name="gender" value="M" type="radio" data-map="GENDER" class="form-check-input"/>
-							  <label class="form-check-label" for="male">남자</label>
-							</div>
-							<div class="form-check form-check-inline">
-							  <input name="gender" value="F" type="radio" data-map="GENDER" class="form-check-input"/>
-							  <label class="form-check-label" for="female">여자</label>
-							</div>
-                      	</span>
-                      </div>
-                    </div>
-                  </div>
                   <div class="col-md-6">
                     <div class="row">
                       <label class="col-sm-3 col-form-label text-sm-end required" for="emailAddress"
@@ -140,12 +127,20 @@
                   </div>
                   <div class="col-md-6">
                     <div class="row">
-                      <label class="col-sm-3 col-form-label text-sm-end" for=positionName>직위</label>
+                      <label class="col-sm-3 col-form-label text-sm-end" for="positionName">직위</label>
                       <div class="col-sm-9">
                         <input name="positionName" type="text" data-map="POS_NM" class="form-control" placeholder="직위"/>
                       </div>
                     </div>
                   </div>
+                  <div class="col-md-6">
+                    <div class="row">
+                      <label class="col-sm-3 col-form-label text-sm-end" for="mobilePhoneNo">휴대전화</label>
+                      <div class="col-sm-9">
+                        <input name="mobilePhoneNo" type="text" data-map="MBL_TELNO" class="form-control" placeholder="휴대전화"/>
+                      </div>
+                    </div>
+                  </div>
                   <div class="col-md-6">
                     <div class="row">
                       <label class="col-sm-3 col-form-label text-sm-end" for="status">상태</label>
@@ -185,24 +180,60 @@
 		</c:forEach>
 	</datalist>
               
+	<datalist id="userSeCdList">
+		<c:forEach items="${CMN008List}" var="item">
+			<option value="${item.code}">${item.value}</option>
+		</c:forEach>
+	</datalist>
               
 <script type="text/javascript">
 var infoPrefixFields = new FimsFormFields("#infoPrefix-form");
 
-infoPrefixControl.setInfo = obj => {
+infoPrefixControl.setInfo = (obj) => {
+	let create = isEmpty(obj.data.USER_ACNT);
+	if(create){
+		obj.data.CNTN_SE_CD = "01";
+	}
+	
+	let isInnerUser = (obj.data.CNTN_SE_CD == "01");
+	if(!isInnerUser){
+		$("#infoPrefix-form select[name='userSeCd']").html($("#userSeCdList option[value='21']").clone());
+		$("#btnSelectOgdp").attr("hidden","hidden");
+	} else {
+		$("#infoPrefix-form select[name='userSeCd']").html($("#userSeCdList option[value!='21']").clone());
+		$("#btnSelectOgdp").removeAttr("hidden");
+	}
+	
 	infoPrefixFields.set(infoPrefixControl,obj);
 
-	let create = isEmpty(obj.data.USER_ACNT);
+	$("#infoPrefix-form input[name='account']").prop("readonly", !create);
-	$("input[name='account']").prop("readonly", !create);
+	$("#infoPrefix-form input[name='name']").prop("readonly", !create);
-	$("input[type='password']").each(function(){
+	
+	$("#infoPrefix-form input[type='password']").each(function(){
 		let password = $(this).prop("required", create);
 		let div = password.parent().parent().parent();
 		if (create) {
 			div.removeAttr("hidden");
-		} else
+		} else {
 			div.attr("hidden","hidden");
+		}
 	});
-	$("label[for='STTS']").html(obj.data.STTS == "P" ? "승인" : "신청");
+	
+	let positionNameDiv = $("#infoPrefix-form input[name='positionName']").parent().parent().parent();
+	if (isInnerUser) {
+		positionNameDiv.removeAttr("hidden");
+	} else {
+		positionNameDiv.attr("hidden","hidden");
+	}
+	
+	let mobilePhoneNoDiv = $("#infoPrefix-form input[name='mobilePhoneNo']").parent().parent().parent();
+	if (!isInnerUser) {
+		mobilePhoneNoDiv.removeAttr("hidden");
+	} else {
+		mobilePhoneNoDiv.attr("hidden","hidden");
+	}
+	
+	$("#infoPrefix-form label[for='STTS']").html(obj.data.STTS == "P" ? "승인" : "신청");
 	
 	$("#infoPrefix-form").find("input,select")
 		.change(function() {
@@ -213,7 +244,7 @@ infoPrefixControl.setInfo = obj => {
 		})
 		.onEnterPress(saveinfoPrefix);
 	
-	document.querySelector("input[name='" + (create ? "account" : "name") + "']").focus();
+	document.querySelector("#infoPrefix-form input[name='" + (create ? "account" : "name") + "']").focus();
 }
 
 infoPrefixControl.onModify = (changed) => {
@@ -227,14 +258,14 @@ infoPrefixControl.onModify = (changed) => {
 function saveinfoPrefix() {
 	if (!$("#infoPrefix-form").find("input,select").validInputs()) return;
 	
-	let match = Array.from(document.querySelectorAll("input[type='password']"))
+	let match = Array.from(document.querySelectorAll("#infoPrefix-form input[type='password']"))
 		.map(input => input.value)
 		.reduce((total, current) => total == current);
 	if (!match) {
 		dialog.alert({
 			content:"비밀번호와 비밀번호 확인이 다릅니다.",
 			onClose:function(){
-				document.querySelector("input[name='confirmPassword']").focus();
+				document.querySelector("#infoPrefix-form input[name='confirmPassword']").focus();
 			}
 		});
 		return;

src/main/webapp/WEB-INF/jsp/base/user/user-main.jsp

@@ -24,10 +24,12 @@
 			<div class="table-responsive">
 				<table class="datatables-ajax table table-bordered dataTable no-footer" id="DataTables_Table_0" aria-describedby="DataTables_Table_0_info">
 					<thead id="${infoPrefix}Thead">
-						<tr><th tabindex="0" style="width: 158.828px; text-align:center;"><input onchange="${infoPrefix}Control.select(this.checked);" type="checkbox" class="form-check-input"></th>
+						<tr>
+							<th tabindex="0" style="width: 158.828px; text-align:center;"><input onchange="${infoPrefix}Control.select(this.checked);" type="checkbox" class="form-check-input"></th>
+							<th class="sorting" style="width: 146.156px;">사용자구분</th>
+							<th class="sorting" style="width: 146.156px;">기관</th>
 							<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">계정</th>
 							<th class="sorting" style="width: 146.156px;">이름</th>
-                            <th class="sorting" style="width: 146.156px;">기관</th>
                             <th class="sorting" style="width: 146.156px;">부서</th>
 							<th class="sorting" style="width: 195.688px;">이메일</th>
 							<th class="sorting" style="width: 160.141px;">전화번호(유선)</th>
@@ -39,9 +41,10 @@
                    	<template id="${infoPrefix}Row">
 	                   	<tr data-key="{USER_ID}">
 	                       <td style="text-align:center;"><input value="{USER_ID}" onchange="${infoPrefix}Control.select('{USER_ID}', this.checked);" type="checkbox" class="form-check-input"></td>
+	                       <td {onclick} {ondblclick}>{USER_SE_NM}</td>
+	                       <td {onclick} {ondblclick}>{INST_NM}</td>
 	                       <td {onclick} {ondblclick}>{USER_ACNT}</td>
 	                       <td {onclick} {ondblclick}>{USER_NM}</td>
-                       <td {onclick} {ondblclick}>{INST_NM}</td>
 	                       <td {onclick} {ondblclick}>{DEPT_NM}</td>
 	                       <td {onclick} {ondblclick}>{EML_ADRS}</td>
 	                       <td {onclick} {ondblclick}>{TELNO}</td>

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp

@@ -380,7 +380,7 @@ $(document).ready(function(){
 		});
 		$("#table-responsive--${pageName}")[0].changeColumn(colsStr);
 
-		if(SYS_LINK_INFO.NXRP_LINK_YN != 'Y'){
+		if(SYS_LINK_INFO = null || SYS_LINK_INFO.NXRP_LINK_YN != 'Y'){
 			$("#btnSendCrdn--${pageName}").attr("hidden","hidden");
 		} else {
 			$("#btnSendCrdn--${pageName}").prop("disabled", true);

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp

@@ -69,7 +69,6 @@ var NTR034 = new CommonCodes(${NTR034});
 $(document).ready(function(){
 
 	var list = ${list};
-	console.log(list);
 	
 	var $P = pageObject["${pageName}"];
 	

src/main/webapp/WEB-INF/jsp/fims/user/user01010-main.jsp

@@ -34,7 +34,10 @@
 <body>
 
 <form id="user-form">
+	<input type="hidden" name="cntnSeCd" data-map="CNTN_SE_CD" />
+	
 	<div class="row g-3 mt-4">
+		<c:if test="${cntnSeCd == '01'}">
 			<div class="col-md-12">
 				<label class="col-form-label required">
 				시군구/기관 및 부서
@@ -54,7 +57,6 @@
 					</c:forEach>
 				</select>
 				<input type="hidden" name="orgID" data-map="ORG_ID" />
-				
 				<div class="dropdown d-inline-flex">
 					<button type="button" 
 					class="btn btn-md btn-secondary dropdown-toggle"
@@ -70,6 +72,27 @@
 					</ul>
 				</div>
 			</div>
+			<div class="col-md-6">
+				<label class="col-sm-3 col-form-label text-sm-end required" for="userSeCd">
+				유저구분
+				</label>
+				<select name="userSeCd" data-map="USER_SE_CD" class="form-select">
+					<c:forEach items="${CMN008List}" var="item">
+						<c:if test="${item.code != '21'}">
+							<option value="${item.code}">${item.value}</option>
+						</c:if>
+					</c:forEach>
+				</select>
+			</div>
+			<div class="col-md-6"></div>
+		</c:if>
+		<c:if test="${cntnSeCd == '02'}">
+			<input type="hidden" name="orgID" data-map="ORG_ID" />
+			<input type="hidden" name="institute" data-map="NSTT_CD" />
+			<input type="hidden" name="deptCode" data-map="DEPT_CD" />
+			
+			<input type="hidden" name="userSeCd" data-map="USER_SE_CD" />
+		</c:if>
 		
 		<div class="col-md-6">
 			<div class="row">
@@ -116,34 +139,6 @@
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6">
-			<div class="row">
-				<label class="col-sm-3 col-form-label text-sm-end" for="birthday">
-				생년월일
-				</label>
-				<div class="col-sm-9">
-					<input name="birthday" type="text" data-map="BRDT" class="form-control dob-picker" 
-					placeholder="YYYY-MM-DD"/>
-				</div>
-			</div>
-		</div>
-		<div class="col-md-6">
-			<div class="row">
-				<label class="col-sm-3 col-form-label text-sm-end" for="gender">성별</label>
-				<div class="col-sm-9">
-					<span class="d-inline-flex flex-wrap w-100 h-100 align-content-center">
-						<div class="form-check form-check-inline">
-							<input name="gender" value="M" type="radio" data-map="GENDER" class="form-check-input"/>
-							<label class="form-check-label" for="male">남자</label>
-						</div>
-						<div class="form-check form-check-inline">
-							<input name="gender" value="F" type="radio" data-map="GENDER" class="form-check-input"/>
-							<label class="form-check-label" for="female">여자</label>
-						</div>
-					</span>
-				</div>
-			</div>
-		</div>
 		<div class="col-md-6">
 			<div class="row">
 				<label class="col-sm-3 col-form-label text-sm-end required" for="emailAddress">이메일 주소</label>
@@ -171,15 +166,30 @@
 				</div>
 			</div>
 		</div>
+		
+		<c:if test="${cntnSeCd == '01'}">
 			<div class="col-md-6">
 				<div class="row">
-				<label class="col-sm-3 col-form-label text-sm-end" for=positionName>직위</label>
+					<label class="col-sm-3 col-form-label text-sm-end" for="positionName">직위</label>
 					<div class="col-sm-9">
 						<input name="positionName" type="text" data-map="POS_NM" class="form-control" 
 						placeholder="직위"/>
 					</div>
 				</div>
 			</div>
+		</c:if>
+		<c:if test="${cntnSeCd == '02'}">
+			<div class="col-md-6">
+				<div class="row">
+					<label class="col-sm-3 col-form-label text-sm-end" for="mobilePhoneNo">휴대전화</label>
+					<div class="col-sm-9">
+						<input name="mobilePhoneNo" type="text" data-map="MBL_TELNO" class="form-control" 
+						placeholder="휴대전화"/>
+					</div>
+				</div>
+			</div>
+		</c:if>
+		
 		<div class="col-md-6">
 			<div class="row">
 				<label class="col-sm-3 col-form-label text-sm-end" for="status">상태</label>
@@ -237,8 +247,9 @@ userControl.setInfo = obj => {
 		$("#btnDuplicate").hide();
 	}
 	
-	$("input[name='account']").prop("readonly", !create);
+	$("#user-form input[name='account']").prop("readonly", !create);
-	$("input[type='password']").each(function(){
+	$("#user-form input[name='name']").prop("readonly", !create);
+	$("#user-form input[type='password']").each(function(){
 		let password = $(this).prop("required", create);
 		let div = password.parent().parent().parent();
 		if (create) {
@@ -255,7 +266,7 @@ userControl.setInfo = obj => {
 		})
 		.onEnterPress(saveUser);
 	
-	document.querySelector("input[name='" + (create ? "account" : "name") + "']").focus();
+	document.querySelector("#user-form input[name='" + (create ? "account" : "name") + "']").focus();
 }
 
 userControl.onModify = (changed) => {
@@ -268,14 +279,14 @@ userControl.onModify = (changed) => {
 function saveUser() {
 	if (!$("#user-form").find("input,select").validInputs()) return;
 	
-	let match = Array.from(document.querySelectorAll("input[type='password']"))
+	let match = Array.from(document.querySelectorAll("#user-form input[type='password']"))
 		.map(input => input.value)
 		.reduce((total, current) => total == current);
 	if (!match) {
 		dialog.alert({
 			content:"비밀번호와 비밀번호 확인이 다릅니다.",
 			onClose:function(){
-				document.querySelector("input[name='confirmPassword']").focus();
+				document.querySelector("#user-form input[name='confirmPassword']").focus();
 			}
 		});
 		return;
@@ -292,6 +303,13 @@ function saveUser() {
 function save(info){
 	var create = isEmpty(info.id)
 
+	if(create && "${cntnSeCd}" == "02"){
+		info.orgID = "${sggCd}";
+		info.institute = "${institute}";
+		info.deptCode = "EMPTY00";
+		info.userSeCd = "21";
+	}
+	
 	ajax.post({
 		url:!create ? wctx.url("/user/updateMyInfo.do") : wctx.url("/signup.do"),
 		data:info,
@@ -340,6 +358,12 @@ $("#btnDuplicate").on("click", function(){
 });
 
 var userInfo = ${userInfo};
+if(userInfo.USER_ID == null && "${cntnSeCd}" == "02"){
+	userInfo.ORG_ID = "${sggCd}";
+	userInfo.NSTT_CD = "${institute}";
+	userInfo.USER_SE_CD = "21";
+	userInfo.CNTN_SE_CD = "02";
+}
 userControl.setInfo(userInfo);
 
 wctx.csrf = window.opener.wctx.csrf;

src/main/webapp/WEB-INF/jsp/index.jsp

@@ -63,7 +63,6 @@
     <!-- 자동 로그아웃 -->
     <script src="<c:url value="/webjars/3rd-party/sneat/libs/idletimer/idletimer.js"/>"></script>
     
-    
     <c:set var="onload">
 		
     </c:set>
@@ -81,16 +80,6 @@
 				
 				$("#menu-tabs .nav-item").eq(0).find("span.ms-2").remove();
 				
-				//$("#menu-tabs .nav-item").hover(
-					//function() {
-						//let span = $(this).find("span.ms-2");
-						//if (span.attr("onclick").includes(sticky.url)) return;
-						//span.show();
-					//},
-					//function() {
-						//$(this).find("span.ms-2").hide();
-					//}
-				//);
 			},
 			onCurrentChange: tab => {
 				if (!tab || !tab.data) return;
@@ -232,7 +221,7 @@
 					data: {},
 					dataType: 'json',
 					success: function(resp, textStatus, jqXHR) {
-						if(resp.sggHasTask == "Y"){
+						if(resp.sggHasTask == "Y" || "${currentUser.user.getCntnSeCd()}" == "02"){
 							resolve({resp, textStatus, jqXHR});
 						} else {
 							reject("시군구 업무 설정이 없습니다.");
@@ -287,13 +276,17 @@
     			success : (resp) => {
     				if(resp.saved){
     					$("#selectTaskModal").modal("hide");
-    		    		initIndexPage(PARAM_TASK, taskSeCd);
+    		    		initIndexPage(true, PARAM_TASK, taskSeCd);
     				}
     			}
     		});
     	}
     	
-    	function initIndexPage(paramTask, userDefaultTask){
+    	function initIndexPage(isPublicOfficer, paramTask, userDefaultTask){
+    		if(!isPublicOfficer){
+    			$("#home").html("과태료통합관리시스템<br/>("+"임대기업사용자"+")");
+				return;
+			}
     		
 			if(paramTask != "" || $("#layout-navbar").find("input[name='taskSeCd'][value='"+paramTask+"']").length > 0){
 				$("#layout-navbar input[name='taskSeCd'][value='"+paramTask+"']").prop("checked", true);
@@ -347,10 +340,14 @@
    					available = false;
    				}
 
-   				if(!(MY_INFO.info.isAdmin) && !(MY_INFO.info.hasTaskAuth)){
+   				if(!(MY_INFO.info.isAdmin)){
+					if(MY_INFO.info.isPublicOfficer){
+						if(!(MY_INFO.info.hasTaskAuth)){
 							msg = "계정에 부여된 업무권한이 없습니다.";
 		   					available = false;
 						}
+					}
+   				}
    			
    				if(msg != ""){
    					alert(msg);
@@ -371,7 +368,7 @@
    				
    				//사용하지 않는 연계와 관련된 메뉴 제거
    				//새올민원 관련 메뉴 제거
-   				if(SYS_LINK_INFO.CVLCPT_LINK_SE_CD != '01'){
+   				if(SYS_LINK_INFO == null || SYS_LINK_INFO.CVLCPT_LINK_SE_CD != '01'){
    					var seallMenuUrl = wctx.url("/cvlc/cvlc04/010/main.do");
    					$("ul[id='menus']").find("li[class='menu-item']").each(function(){
 						if($(this).children("a[onclick]").length > 0){
@@ -383,6 +380,7 @@
    					});
    				}
    				
+   				if(MY_INFO.info.isPublicOfficer){
    					//사용자별 선택가능한 업무 렌더링
    	   				$("#selectTaskButtons").html("");
    	   				for(var i=0; i < MY_INFO.info.taskForUser.length; i++){
@@ -403,6 +401,7 @@
    	   							+`</button>`;
    	   					$("#selectTaskButtons").append(button);
    	   				}
+   	   				
    	   				$("#layout-navbar input[name='taskSeCd']").on("click", function(){
    	   					$("#userNav--top").click();
    	   					window.open(wctx.url("/")+"?taskSeCd="+this.value, "_blank", "");
@@ -414,9 +413,12 @@
    	   					$("#selectTaskModal").modal("show");
    	   					return;
    	   				} else {
-   					initIndexPage(PARAM_TASK, MY_INFO.info.defaultTask);
+   	   					initIndexPage(true, PARAM_TASK, MY_INFO.info.defaultTask);
    	   					return;
    	   				}
+				} else {
+					initIndexPage(false, "", "");
+				}
    				
 			}).catch((msg) => {
 				alert(msg);

src/main/webapp/WEB-INF/jsp/login.jsp

@@ -39,29 +39,23 @@
 
 </head>
 <body>
-<div class="login_bg">
+<div class="login_bg" hidden>
 	<div class="header_wrap">
 		<h1 class="logo">
 			<img src="<c:url value='/'/>resources/img/login/mainLogo_02.png" alt="Logo Image" />
+			<span id="userFor" hidden>(임대기업사용자)</span>
 			<span class="float-end mt-4 me-5">
-				<button type="button" onclick="fnMenualDownload();" class="btn btn-primary">사용자 메뉴얼</button>
+				<button id="btnDownMenual" type="button" onclick="fnMenualDownload();" class="btn btn-primary" hidden>사용자 메뉴얼</button>
 			</span>
 		</h1>
 	</div>
 	<div class="login_text">
 		<p class="main_img"><img src="<c:url value='/'/>resources/img/login/loginDeco_02.png" alt=""></img></p>
 		<form id="formAuthentication" method="post">
+			<input type="hidden" id="cntnSeCd" name="cntnSeCd" />
 			<div class="input_wrap">
-				<div class="input-group">
+				<div class="input-group" id="orgDiv">
-					<select id="orgID" name="orgID" required title="시군구명" class="form-select mb-2 h-px-40 no-max-w">
+					
-						<option value="">[기관 선택]</option>
-						<option value="ADMIN">시스템관리</option>
-						<c:forEach items="${sggList}" var="item">
-							<option value="${item.SGG_CD}"
-							<c:if test="${item.USER_USE_YN == 'N'}"> disabled </c:if>
-							>${item.SGG_NM}</option>
-						</c:forEach>
-					</select>
 				</div>
 				<div class="input-group">
 					<input type="text" id="userId" value="${cookie['userAccount'].getValue()}"
@@ -81,7 +75,7 @@
 					<a href="#" onclick="javascript:fn_FindId(); return false;">아이디 찾기</a>
 					<a href="#" onclick="javascript:fn_FindPw(); return false;" class="line">비밀번호 찾기</a>
 					-->
-					<a href="#" onclick="javascript:fnOpenSignup(); return false;" class="line">회원가입</a>
+					<a href="#" onclick="javascript:fnOpenSignup_step1(); return false;" class="line">회원가입</a>
 				</div>
 			</div>
 			<input type="hidden" name="message" value="${message}" />
@@ -94,6 +88,21 @@
 	</div>
 </div>
 
+<template id="pbofcLoginTemplate">
+	<select id="orgID" name="orgID" required title="시군구명" class="form-select mb-2 h-px-40 no-max-w">
+		<option value="">[기관 선택]</option>
+		<option value="ADMIN">시스템관리</option>
+		<c:forEach items="${sggList}" var="item">
+			<option value="${item.SGG_CD}"
+			<c:if test="${item.USER_USE_YN == 'N'}"> disabled </c:if>
+			>${item.SGG_NM}</option>
+		</c:forEach>
+	</select>
+</template>
+<template id="bzentLoginTemplate">
+	<input type="hidden" id="orgID" name="orgID" required title="시군구명" value="${sysSggCd}" />
+</template>
+
 <template id="selectOrgDialogTemplate">
 	<select class="form-select form-control-sm" id="selectOrg">
 		<option value="">선택</option>
@@ -109,6 +118,11 @@
 
 ${functions}
 
+let sysSgg = "${sysSggCd}";
+let cookieOrg = "${cookie['userOrg'].getValue()}";
+let cookieUserId = "${cookie['userAccount'].getValue()}";
+
+
 function login() {
 	if (!$("#formAuthentication input,select").validInputs()) return;
 	
@@ -116,6 +130,7 @@ function login() {
 		account:$("#userId").val(),
 		password:$("#password").val(),
 		orgID: $("#orgID").val(),
+		cntnSeCd: $("#cntnSeCd").val(),
 		rememberCredentials: $("#remember").prop("checked")
 	};
 	
@@ -158,7 +173,8 @@ function login() {
 /**
  * 회원가입 팝업
  */
-function fnOpenSignup(){
+function fnOpenSignup_step1(){
+	if($("#cntnSeCd").val() == "01"){
 		dialog.open({
 			id : "selectOrgDialog",
 			title : "기관 선택",
@@ -173,12 +189,23 @@ function fnOpenSignup(){
 				}
 				dialog.close("selectOrgDialog");
 				
+				fnOpenSignup_step2($("#selectOrg").val(),"01");
+			},
+			onClose : () => {}
+		});
+	} else if($("#cntnSeCd").val() == "02"){
+		fnOpenSignup_step2("${sysSggCd}","02");
+	}
+
+}
+
+function fnOpenSignup_step2(sggCd,cntnSeCd){
 	var popupWidth = 950;
 	var popupHeight = 500;
 	var popupX = (window.screen.width / 2) - (popupWidth / 2);
 	var popupY= (window.screen.height / 2) - (popupHeight / 2);
 	
-			var popup = window.open(wctx.url("/signupPage.do")+"?sggCd="+$("#selectOrg").val(), 
+	var popup = window.open(wctx.url("/signupPage.do")+"?sggCd="+sggCd+"&cntnSeCd="+cntnSeCd, 
 			"regAccount", 
 			"width="+popupWidth+", height="+popupHeight+", left="+popupX+", top="+popupY);
 	
@@ -188,10 +215,6 @@ function fnOpenSignup(){
 			$.unblockUI();
 		});
 	};
-		},
-		onClose : () => {}
-	});
-
 }
 
 /**
@@ -208,14 +231,44 @@ function fn_FindPw(){
 	window.open(".do", "findPw", {width: 500, height:330});
 }
 
+function fnIpInfo(flag){
+	$("#cntnSeCd").val("");
+	$("#orgDiv").html("");
+	$("#userId").val("");
+	$("#password").val("");
+	$("#btnDownMenual").attr("hidden","hidden");
+	$("#userFor").attr("hidden","hidden");
+	$("#remember").prop("checked", false);
 	
-$(function(){
+	let data = {};
-	$("#formAuthentication input").onEnterPress(login);
+	if(flag != null){
+		data.flag = flag;
+	}
+	ajax.get({
+		url:wctx.url("/ipInfo.do"),
+		data:data,
+		success:function(resp) {
+			if(resp.net == "intra"){
+				PBOFC_login();
+			} else if(resp.net == "inter"){
+				BZENT_login();
+			}
+			
+		}
+	});
+}
+
+//공무원 로그인
+function PBOFC_login(){
+	
+	$(".login_bg").removeAttr("hidden");
+	$("#btnDownMenual").removeAttr("hidden");
+	
+	$("#cntnSeCd").val("01");
+	$("#orgDiv").html(document.getElementById("pbofcLoginTemplate").innerHTML);
 	
-	let sysSgg = "${sysSggCd}";
-	let cookieOrg = "${cookie['userOrg'].getValue()}";
-	let cookieUserId = "${cookie['userAccount'].getValue()}";
 	let hasCookie = (cookieOrg != "" && cookieUserId != "");
+	
 	let selectValue = "";
 	let isSelectable = false;
 
@@ -239,7 +292,39 @@ $(function(){
 	} else {
 		$("#orgID").focus();
 	}
+}
+
+//업체 로그인
+function BZENT_login(){
 	
+	$(".login_bg").removeAttr("hidden");
+	$("#userFor").removeAttr("hidden");
+	
+	$("#cntnSeCd").val("02");
+	$("#orgDiv").html(document.getElementById("bzentLoginTemplate").innerHTML);
+	
+	let hasCookie = (cookieUserId != "");
+	if(hasCookie){
+		$("#userId").val(cookieUserId);
+		$("#remember").prop("checked", true);
+		$("#password").focus();
+	} else {
+		$("#userId").focus();
+	}
+}
+
+
+$("#formAuthentication input").onEnterPress(login);
+
+document.addEventListener('keydown', (event) => {
+	if(event.key == "F5"){
+		event.preventDefault();
+		fnIpInfo('inter');
+	}
+});
+
+$(function(){
+	fnIpInfo();
 });
 
 </script>