From d986c6db074da9cc922cb6996bbd93e6b39b53f6 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 7 Jun 2023 14:56:46 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=9C=A0=EC=A0=80=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fims/framework/biz/cmm/XitLoginVO.java    | 18 +++++++--------
 .../biz/cmm/XitUserInfoChangeDtlsVO.java      | 22 +++++++++----------
 .../framework/biz/mng/user/XitUserInfoVO.java | 11 +++++-----
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java
index 211724d9..4d25245e 100644
--- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java
+++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitLoginVO.java
@@ -18,16 +18,17 @@ public class XitLoginVO implements Serializable{
 	 * serialVersionUID
 	 */
 	private static final long serialVersionUID = 4351132649093520622L;
-	
-	
-	/** 아이디 */
+
+	/** 고유아이디 */
+	private String uniqId;
+	/** 계정아이디 */
 	private String id;
+	/** 비밀번호 */
+	private String passwd;
 	/** 이름 */
 	private String name;
 	/** 이메일주소 */
 	private String email;
-	/** 비밀번호 */
-	private String passwd;
 	/** 비밀번호 힌트 */
 	private String passwdHint;
 	/** 비밀번호 정답 */
@@ -40,8 +41,7 @@ public class XitLoginVO implements Serializable{
 	private String orgId;
 	/** 조직명 */
 	private String orgnztNm;
-	/** 고유아이디 */
-	private String uniqId;
+
 	/** 로그인 후 이동할 페이지 */
 	private String url;
 	/** 사용자 IP정보 */
@@ -84,7 +84,8 @@ public class XitLoginVO implements Serializable{
 		} else if(obj instanceof XitUserInfoVO) {
 			//업무사용자
 			XitUserInfoVO vo = (XitUserInfoVO)obj;
-			this.id                = vo.getUserId();
+			this.uniqId            = vo.getUserId();
+			this.id                = vo.getUserAcnt();
 			this.name              = vo.getUserNm();
 			this.passwd          = vo.getPasswd();
 			this.email             = vo.getEmlAdrs();
@@ -93,7 +94,6 @@ public class XitLoginVO implements Serializable{
 			this.orgnztNm          = vo.getOrgnztNm();
 			this.grpId           = vo.getGrpId();
 			this.nsttCd       = vo.getNsttCd();
-			this.uniqId            = vo.getUserKey();
 			this.jobDataAuthor     = vo.getJobDataAuthor();
 			this.userManageAuthor  = vo.getUserManageAuthor();
 			this.elctrnsanctnUseYn = vo.getElctrnsanctnUseYn();
diff --git a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java
index a61231ba..a46290dd 100644
--- a/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java
+++ b/src/main/java/kr/xit/fims/framework/biz/cmm/XitUserInfoChangeDtlsVO.java
@@ -17,8 +17,8 @@ public class XitUserInfoChangeDtlsVO extends BaseVO {
 	 * serialVersionUID
 	 */
 	private static final long serialVersionUID = 5110481577978255607L;
-	
-	protected String userId; //사용자 id
+	protected String userId; //고유 id
+	protected String userAcnt; //계정 id
 	protected String changeDe; //변경 일
 	protected String orgId; //조직 id
 	protected String grpId; //그룹 id
@@ -37,13 +37,13 @@ public class XitUserInfoChangeDtlsVO extends BaseVO {
 
 	protected String nsttCd; //소속기관 코드
 	protected String stts; //사용자 상태 코드
-	protected String userKey; //고유 id
+
 	
-	public String getUserId() {
-		return userId;
+	public String getUserAcnt() {
+		return userAcnt;
 	}
-	public void setUserId(String userId) {
-		this.userId = userId;
+	public void setUserAcnt(String userAcnt) {
+		this.userAcnt = userAcnt;
 	}
 	public String getChangeDe() {
 		return changeDe;
@@ -144,11 +144,11 @@ public class XitUserInfoChangeDtlsVO extends BaseVO {
 	public void setStts(String stts) {
 		this.stts = stts;
 	}
-	public String getUserKey() {
-		return userKey;
+	public String getUserId() {
+		return userId;
 	}
-	public void setUserKey(String userKey) {
-		this.userKey = userKey;
+	public void setUserId(String userId) {
+		this.userId = userId;
 	}
 
 
diff --git a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java
index 0cf4a2e5..6c808278 100644
--- a/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java
+++ b/src/main/java/kr/xit/fims/framework/biz/mng/user/XitUserInfoVO.java
@@ -23,12 +23,13 @@ public class XitUserInfoVO extends XitUserEtcOptionVO {
 	 * serialVersionUID
 	 */
 	private static final long serialVersionUID = -4545167436366021662L;
-	
-//	protected String userId; //사용자 id
-	protected String orgId; //조직 id
-	protected String userNm; //사용자 명
+
+	protected String userId; //고유 id
+	protected String userAcnt; //계정 id
 	protected String passwd; //비밀번호
 	protected String passwd2; //비밀번호
+	protected String orgId; //조직 id
+	protected String userNm; //사용자 명
 	protected String empNo; //사원 번호
 	protected String gender; //성별 코드
 	protected String brdt; //생일
@@ -46,7 +47,7 @@ public class XitUserInfoVO extends XitUserEtcOptionVO {
 	protected String grpId; //그룹 id - 업무그룹(sgg_cd)
 	protected String nsttCd; //소속기관 코드 - 시스템코드(sysSeCd)
 	protected String stts; //사용자 상태 코드
-	protected String userKey; //고유 id
+
 	protected String crtfcDn; //인증 dn 값
 	protected String regDt; //가입 일