From d31323b4a8a314f010c54d8d9b502126a079eb67 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 17:11:59 +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