Merge remote-tracking branch 'origin/master'

박지현

2022-02-22 1dad4d94cc415d2f8092aff0368744289337f504

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