From a9277be576a7b76de9bfbaf5e83cd6d6407dbd98 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 17 11월 2021 11:14:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/DepartmentService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/DepartmentService.java b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
index 682ad46..09c1ca9 100644
--- a/src/main/java/kr/wisestone/owl/service/DepartmentService.java
+++ b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
@@ -5,6 +5,7 @@
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;
@@ -29,8 +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