From c8d436c6d85ea6f1e93c838a8b5a4690d0f075e4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 10:43:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/domain/User.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 5674d6c..679b680 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -1,7 +1,6 @@
package kr.wisestone.owl.domain;
import kr.wisestone.owl.domain.enumType.SocialType;
-import kr.wisestone.owl.util.CommonUtil;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import javax.persistence.*;
@@ -30,7 +29,6 @@
private String phone;
private String profile;
private String awsKey;
-// private Long departmentId;
@Enumerated(EnumType.STRING)
private SocialType socialType;
private Long lastWorkspaceId;
@@ -65,10 +63,9 @@
@JoinColumn(name="level_id")
private UserLevel userLevel;
- @ManyToOne(targetEntity = DepartmentManagement.class, fetch = FetchType.LAZY)
- @JoinColumn(name="department_id")
- private DepartmentManagement departmentManagement;
-
+// @ManyToOne(targetEntity = Department.class, fetch = FetchType.LAZY)
+// @JoinColumn(name="department_id")
+// private Department department;
public User() {
}
@@ -77,14 +74,6 @@
this.id = id;
this.name = name;
this.account = account;
- }
-
- public DepartmentManagement getDepartmentId() {
- return departmentManagement;
- }
-
- public void setDepartmentId(DepartmentManagement department) {
- this.departmentManagement = department;
}
public UserLevel getUserLevel() {
--
Gitblit v1.8.0