From a00047ce04e06bb99a637b8b02ec4bf2b4fdd25c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 10 11월 2021 16:26:37 +0900
Subject: [PATCH] 사용자의 부서 수정 기능 프론트 작업 수정
---
src/main/java/kr/wisestone/owl/domain/User.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index 29b8f96..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() {
@@ -310,10 +299,10 @@
return this.userLevel.getPermission();
}
- // TEST
- //public void setPermission(Integer permission) {
- // this.userLevel.setPermission(permission);
- //}
+ // wyu - TEST
+// public void setPermission(Integer permission) {
+// this.userLevel.setPermission(permission);
+// }
public String getLicensekey() {
return licensekey;
--
Gitblit v1.8.0