From 8abf5efd48aba1cfc101966bd4f420e463d41dcd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 03 11월 2021 20:47:54 +0900
Subject: [PATCH] defaultYn 추가 basicUser 추가 엑셀, 상세조회 진행중 일반회원 조회 추가 V1_10 Table 변경(데이터 삭제후 진행)

---
 src/main/java/kr/wisestone/owl/domain/User.java |   38 +++++++++++++++++++++++++++++++++-----
 1 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/domain/User.java b/src/main/java/kr/wisestone/owl/domain/User.java
index a0e43bb..5674d6c 100644
--- a/src/main/java/kr/wisestone/owl/domain/User.java
+++ b/src/main/java/kr/wisestone/owl/domain/User.java
@@ -30,6 +30,7 @@
     private String phone;
     private String profile;
     private String awsKey;
+//    private Long departmentId;
     @Enumerated(EnumType.STRING)
     private SocialType socialType;
     private Long lastWorkspaceId;
@@ -37,7 +38,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 +61,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 = DepartmentManagement.class, fetch = FetchType.LAZY)
+    @JoinColumn(name="department_id")
+    private DepartmentManagement departmentManagement;
+
+
     public User() {
     }
 
@@ -69,6 +78,23 @@
         this.name = name;
         this.account = account;
     }
+
+    public DepartmentManagement getDepartmentId() {
+        return departmentManagement;
+    }
+
+    public void setDepartmentId(DepartmentManagement department) {
+        this.departmentManagement = department;
+    }
+
+    public UserLevel getUserLevel() {
+        return userLevel;
+    }
+
+    public void setUserLevel(UserLevel userLevel) {
+        this.userLevel = userLevel;
+    }
+
 
     public Long getId() {
         return id;
@@ -279,13 +305,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;

--
Gitblit v1.8.0