사용자 관리 백앤드 수정

wyu

2021-11-10 578590c0540eee79ccf3af069db71efaf6bc2bfc

 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 = UserDepartment.class, fetch = FetchType.LAZY)
//    @JoinColumn(name="department_id")
//    private UserDepartment userDepartment;

    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;