From 6565e26508224b5d1de1ff7cf0f263fe196790e9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 15:54:06 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/UserService.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/UserService.java b/src/main/java/kr/wisestone/owl/service/UserService.java
index 70af5fa..ca9922e 100644
--- a/src/main/java/kr/wisestone/owl/service/UserService.java
+++ b/src/main/java/kr/wisestone/owl/service/UserService.java
@@ -32,6 +32,8 @@
void detailUser(Map<String, Object> resJsonData, UserCondition userCondition);
+ void findMyLevelAndDepartment(Map<String, Object> resJsonData);
+
void modifyUser(UserForm userForm, MultipartFile profile);
void modifyPassword(UserForm userForm);
@@ -50,6 +52,8 @@
void updateLastProject(Map<String, Object> resJsonData, UserForm userForm);
+ void updateLastIssueType(Map<String, Object> resJsonData, UserForm userForm);
+
void updateLastMyWorkspace(User user);
void findProjectMember(Map<String, Object> resJsonData, UserCondition userCondition);
@@ -63,6 +67,8 @@
User getUserSession(Map<String, Object> resJsonData, HttpServletRequest httpServletRequest);
List<String> findByReservationNotifyTime();
+
+ List<String> findByRealTimeNotifyTime();
List<Map<String, Object>> findProjectMember(Project project);
@@ -80,5 +86,7 @@
void updateLastLogin();
+ boolean useUserLevel(Long id);
+
//ModelAndView downloadExcelEvent(Model model);
}
--
Gitblit v1.8.0