From c2db41cd775d53d02de997c98675da849e51cf0c Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 06 12월 2021 13:29:38 +0900
Subject: [PATCH] 연관이슈구분 기본값(다음이슈와관련됨)으로 추가되도록 수정 * 추후 '연관이슈만들기' 페이지에서 사용자가 직접 선택 할 수 있도록 수정 필요
---
src/main/java/kr/wisestone/owl/web/condition/UserCondition.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java b/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
index 2be9a16..e084ecd 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/UserCondition.java
@@ -25,14 +25,17 @@
private Integer pageSize;
private Long loginUserId;
private Long workspaceId;
- private Integer permission;
+// private Integer permission;
private String licensekey;
public static UserCondition make(Map<String, Object> conditions) {
UserCondition condition = ConvertUtil.convertMapToClass(conditions, UserCondition.class);
- condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
- condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
-
+ if (MapUtil.getStrings(conditions, "statuses") != null) {
+ condition.setStatuses(MapUtil.getStrings(conditions, "statuses"));
+ }
+ if (MapUtil.getStrings(conditions, "excludeIds") != null) {
+ condition.setExcludeIds(MapUtil.getLongs(conditions, "excludeIds"));
+ }
return condition;
}
@@ -144,13 +147,13 @@
this.deep = deep;
}
- public Integer getPermission() {
- return permission;
- }
-
- public void setPermission(Integer permission) {
- this.permission = permission;
- }
+// public Integer getPermission() {
+// return permission;
+// }
+//
+// public void setPermission(Integer permission) {
+// this.permission = permission;
+// }
public String getLicensekey() {
return licensekey;
--
Gitblit v1.8.0