From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 금, 11 2월 2022 18:30:04 +0900 Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정 --- src/main/java/kr/wisestone/owl/web/condition/ProjectCondition.java | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/condition/ProjectCondition.java b/src/main/java/kr/wisestone/owl/web/condition/ProjectCondition.java index 18448d6..97dcb79 100644 --- a/src/main/java/kr/wisestone/owl/web/condition/ProjectCondition.java +++ b/src/main/java/kr/wisestone/owl/web/condition/ProjectCondition.java @@ -25,6 +25,9 @@ private List<String> roleTypes = Lists.newArrayList(); // �봽濡쒖젥�듃 愿�由ъ옄, �씪諛� 李몄뿬�옄瑜� 援щ텇�빐�꽌 媛��졇�삩�떎. private List<Long> excludeIds = Lists.newArrayList(); private List<Long> userIds = Lists.newArrayList(); + private List<Long> departmentIds = Lists.newArrayList(); + private List<Long> myDepartmentIds; // �궡媛� �냽�빐�엳�뒗 遺��꽌 ID + private Long issueTypeId; public ProjectCondition(){} @@ -49,6 +52,14 @@ if (MapUtil.getLongs(conditions, "userIds") != null) { condition.setUserIds(MapUtil.getLongs(conditions, "userIds")); + } + + if (MapUtil.getLongs(conditions, "departmentIds") != null) { + condition.setDepartmentIds(MapUtil.getLongs(conditions, "departmentIds")); + } + + if (MapUtil.getLong(conditions, "issueTypeId") != null) { + condition.setIssueTypeId(MapUtil.getLong(conditions, "issueTypeId")); } return condition; @@ -165,4 +176,28 @@ public void setWorkspaceManager(Boolean workspaceManager) { this.workspaceManager = workspaceManager; } + + public List<Long> getDepartmentIds() { + return departmentIds; + } + + public void setDepartmentIds(List<Long> departmentIds) { + this.departmentIds = departmentIds; + } + + public List<Long> getMyDepartmentIds() { + return myDepartmentIds; + } + + public void setMyDepartmentIds(List<Long> myDepartmentIds) { + this.myDepartmentIds = myDepartmentIds; + } + + public Long getIssueTypeId() { + return issueTypeId; + } + + public void setIssueTypeId(Long issueTypeId) { + this.issueTypeId = issueTypeId; + } } -- Gitblit v1.8.0