From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정

---
 src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java |   97 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
index 047cdc1..d9902f4 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -2,8 +2,6 @@
 
 import com.google.common.collect.Lists;
 import kr.wisestone.owl.constant.MngPermission;
-import kr.wisestone.owl.domain.User;
-import kr.wisestone.owl.domain.UserLevel;
 import kr.wisestone.owl.util.ConvertUtil;
 import kr.wisestone.owl.util.MapUtil;
 
@@ -17,12 +15,16 @@
     private Long id;
     private String levelName;
     private Integer permission;
+    private String defaultYn;
+    private String basicUser;
 
     private List<Long> removeIds = Lists.newArrayList();
-    public Boolean permWorkspaceSetting;
+    public Boolean permPartnerSetting;
+    public Boolean permWorkSpaceSetting;
     public Boolean permProjectSetting;
     public Boolean permIssueSetting;
-    public Boolean permUser;
+    public Boolean permIssueSystemSetting;
+    public Boolean permApi;
     public Boolean permNotice;
     public Boolean permFAQ;
     public Boolean permQnA;
@@ -39,16 +41,8 @@
         if (MapUtil.getLongs(params, "removeIds") != null) {
             form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
         }
-
         return form;
 
-    }
-    public Boolean getPermWorkspaceSetting() {
-        return permWorkspaceSetting;
-    }
-
-    public void setPermWorkspaceSetting(Boolean permWorkspaceSetting) {
-        this.permWorkspaceSetting = permWorkspaceSetting;
     }
 
     public Long getId() {
@@ -75,6 +69,45 @@
         this.permission = permission;
     }
 
+    public String getDefaultYn() {
+        return defaultYn;
+    }
+
+    public void setDefaultYn(String defaultYn) {
+        this.defaultYn = defaultYn;
+    }
+
+    public String getBasicUser() {
+        return basicUser;
+    }
+
+    public void setBasicUser(String basicUser) {
+        this.basicUser = basicUser;
+    }
+
+    public List<Long> getRemoveIds() {
+        return removeIds;
+    }
+
+    public void setRemoveIds(List<Long> removeIds) {
+        this.removeIds = removeIds;
+    }
+
+    public Boolean getPermPartnerSetting() {
+        return permPartnerSetting;
+    }
+
+    public void setPermPartnerSetting(Boolean permPartnerSetting) {
+        this.permPartnerSetting = permPartnerSetting;
+    }
+
+    public Boolean getPermWorkSpaceSetting() {
+        return permWorkSpaceSetting;
+    }
+
+    public void setPermWorkSpaceSetting(Boolean permWorkSpaceSetting) {
+        this.permWorkSpaceSetting = permWorkSpaceSetting;
+    }
 
     public Boolean getPermProjectSetting() {
         return permProjectSetting;
@@ -92,12 +125,20 @@
         this.permIssueSetting = permIssueSetting;
     }
 
-    public Boolean getPermUser() {
-        return permUser;
+    public Boolean getPermIssueSystemSetting() {
+        return permIssueSystemSetting;
     }
 
-    public void setPermUser(Boolean permUser) {
-        this.permUser = permUser;
+    public void setPermIssueSystemSetting(Boolean permIssueSystemSetting) {
+        this.permIssueSystemSetting = permIssueSystemSetting;
+    }
+
+    public Boolean getPermApi() {
+        return permApi;
+    }
+
+    public void setPermApi(Boolean permApi) {
+        this.permApi = permApi;
     }
 
     public Boolean getPermNotice() {
@@ -124,14 +165,6 @@
         this.permQnA = permQnA;
     }
 
-    public Boolean getPermEvent() {
-        return permEvent;
-    }
-
-    public void setPermEvent(Boolean permEvent) {
-        this.permEvent = permEvent;
-    }
-
     public Boolean getPermGuide() {
         return permGuide;
     }
@@ -140,21 +173,23 @@
         this.permGuide = permGuide;
     }
 
-    public List<Long> getRemoveIds() {
-        return removeIds;
+    public Boolean getPermEvent() {
+        return permEvent;
     }
 
-    public void setRemoveIds(List<Long> removeIds) {
-        this.removeIds = removeIds;
+    public void setPermEvent(Boolean permEvent) {
+        this.permEvent = permEvent;
     }
 
     public void makePermission() {
         this.permission = MngPermission.USER_PERMISSION_MNG_NONE;
 
-        this.permission |= MngPermission.makePermission(getPermWorkspaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
         this.permission |= MngPermission.makePermission(getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
-        this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
-        this.permission |= MngPermission.makePermission(getPermUser(), MngPermission.USER_PERMISSION_MNG_USER);
+        this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE);
+        this.permission |= MngPermission.makePermission(getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
+        this.permission |= MngPermission.makePermission(getPermIssueSystemSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
+        this.permission |= MngPermission.makePermission(getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
+        this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
         this.permission |= MngPermission.makePermission(getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
         this.permission |= MngPermission.makePermission(getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
         this.permission |= MngPermission.makePermission(getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA);

--
Gitblit v1.8.0