부서관리 테이블 변경 및 언어팩 수정

wyu

2021-11-05 a4efd2c5d8f2c31d3bfb6860c58af5cb62606c9a

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