From a4efd2c5d8f2c31d3bfb6860c58af5cb62606c9a Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 05 11월 2021 10:51:38 +0900
Subject: [PATCH] 부서관리 테이블 변경 및 언어팩 수정
---
src/main/java/kr/wisestone/owl/domain/User.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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..326836d 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.*;
@@ -65,9 +64,9 @@
@JoinColumn(name="level_id")
private UserLevel userLevel;
- @ManyToOne(targetEntity = DepartmentManagement.class, fetch = FetchType.LAZY)
+ @ManyToOne(targetEntity = DepartmentManage.class, fetch = FetchType.LAZY)
@JoinColumn(name="department_id")
- private DepartmentManagement departmentManagement;
+ private DepartmentManage departmentManage;
public User() {
@@ -79,12 +78,12 @@
this.account = account;
}
- public DepartmentManagement getDepartmentId() {
- return departmentManagement;
+ public DepartmentManage getDepartmentManage() {
+ return departmentManage;
}
- public void setDepartmentId(DepartmentManagement department) {
- this.departmentManagement = department;
+ public void setDepartmentManage(DepartmentManage departmentManage) {
+ this.departmentManage = departmentManage;
}
public UserLevel getUserLevel() {
@@ -310,10 +309,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