From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/java/kr/wisestone/owl/web/condition/ProjectCondition.java | 22 ++++++++++++++++++++++
1 files changed, 22 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..c59b8b4 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,8 @@
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
public ProjectCondition(){}
@@ -49,6 +51,10 @@
if (MapUtil.getLongs(conditions, "userIds") != null) {
condition.setUserIds(MapUtil.getLongs(conditions, "userIds"));
+ }
+
+ if (MapUtil.getLongs(conditions, "departmentIds") != null) {
+ condition.setDepartmentIds(MapUtil.getLongs(conditions, "departmentIds"));
}
return condition;
@@ -165,4 +171,20 @@
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;
+ }
}
--
Gitblit v1.8.0