Merge remote-tracking branch 'origin/master'

jhjang

2021-12-07 12a790240ef0301f839a55e1846ed0c5a32dffee

 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;
    }
}