From fb0491479b2f1155a458f9cbd65b55d9c5a62e69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 13:06:40 +0900
Subject: [PATCH] 부서관리와 등급관리 삭제 시 충돌 버그 해결
---
src/main/java/kr/wisestone/owl/service/DepartmentService.java | 4 ++++
1 files changed, 4 insertions(+), 0 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..e09de70 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;
@@ -29,4 +31,6 @@
ModelAndView downloadExcel(HttpServletRequest request, Model model);
boolean department(Long id);
+
+ List<Map<String, Object>> findByDepartmentIds( UserCondition condition);
}
--
Gitblit v1.8.0