From a6a3bb04cdaa334a2868d09b20518ed98575bccb Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 02 七月 2024 18:08:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/mindskip/xzs/service/UserService.java | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java index ab61ec6..eb652a4 100644 --- a/src/main/java/com/mindskip/xzs/service/UserService.java +++ b/src/main/java/com/mindskip/xzs/service/UserService.java @@ -1,11 +1,12 @@ package com.mindskip.xzs.service; -import com.mindskip.xzs.domain.other.KeyValue; -import com.mindskip.xzs.domain.User; -import com.mindskip.xzs.domain.vo.UserVO; -import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM; import com.github.pagehelper.PageInfo; -import org.apache.ibatis.annotations.Param; +import com.mindskip.xzs.domain.Department; +import com.mindskip.xzs.domain.ExamPaper; +import com.mindskip.xzs.domain.User; +import com.mindskip.xzs.domain.other.KeyValue; +import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM; +import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM; import java.util.List; @@ -76,7 +77,7 @@ * @param requestVM requestVM * @return PageInfo<User> */ - PageInfo<User> userPage(UserPageRequestVM requestVM); + PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM); /** @@ -134,5 +135,21 @@ User getUserByRealName(String realName); - void setStatus(UserVO user); + void setStatus(User user); + + User getUserByExam(ExamPaper examPaper); + + List<Integer> getDeptAdminIds(Integer id); + + List<Department> getDeptAdmins(Integer id); + + User getUserByExamByTemplateId(ExamPaper examPaper); + + /** + * 鑾峰彇鐢ㄦ埛鎵�鍦ㄩ儴闂� + * + * @param id + * @return + */ + List<Integer> getDeptIds(Integer id); } -- Gitblit v1.8.0