From b31979feb926bad9e0070332fb5ed7a896fd378d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 15 11월 2021 17:09:21 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/DepartmentService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/DepartmentService.java b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
index d1a2423..09c1ca9 100644
--- a/src/main/java/kr/wisestone/owl/service/DepartmentService.java
+++ b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
@@ -3,7 +3,9 @@
import kr.wisestone.owl.domain.Department;
import kr.wisestone.owl.vo.DepartmentVo;
import kr.wisestone.owl.web.condition.DepartmentCondition;
+import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.form.DepartmentForm;
+import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.ui.Model;
@@ -28,5 +30,7 @@
ModelAndView downloadExcel(HttpServletRequest request, Model model);
- boolean department(Long id);
+ boolean countInDepartment(Long id);
+
+ List<Map<String, Object>> findByDepartmentIds( UserCondition condition);
}
--
Gitblit v1.8.0