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

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.*;
@@ -30,6 +29,7 @@
    private String phone;
    private String profile;
    private String awsKey;
//    private Long departmentId;
    @Enumerated(EnumType.STRING)
    private SocialType socialType;
    private Long lastWorkspaceId;
@@ -37,7 +37,6 @@
    private Date lastLoginDate;
    private String reservationNotifyTime;   //  이메일 알림 시간 예정
    private String language;
    private Integer permission;
    private String licensekey;

    @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
@@ -61,6 +60,15 @@
    @OneToMany(mappedBy = "user", cascade = {CascadeType.ALL}, orphanRemoval = true)
    private Set<IssueTableConfig> issueTableConfigs = new HashSet<>();

    @ManyToOne(targetEntity = UserLevel.class, fetch = FetchType.LAZY)
    @JoinColumn(name="level_id")
    private UserLevel userLevel;

    @ManyToOne(targetEntity = DepartmentManage.class, fetch = FetchType.LAZY)
    @JoinColumn(name="department_id")
    private DepartmentManage departmentManage;


    public User() {
    }

@@ -69,6 +77,23 @@
        this.name = name;
        this.account = account;
    }

    public DepartmentManage getDepartmentManage() {
        return departmentManage;
    }

    public void setDepartmentManage(DepartmentManage departmentManage) {
        this.departmentManage = departmentManage;
    }

    public UserLevel getUserLevel() {
        return userLevel;
    }

    public void setUserLevel(UserLevel userLevel) {
        this.userLevel = userLevel;
    }


    public Long getId() {
        return id;
@@ -279,13 +304,15 @@
        this.language = language;
    }


    public Integer getPermission() {
        return permission;
        return this.userLevel.getPermission();
    }

    public void setPermission(Integer permission) {
        this.permission = permission;
    }
    // wyu - TEST
//    public void setPermission(Integer permission) {
//        this.userLevel.setPermission(permission);
//    }

    public String getLicensekey() {
        return licensekey;