From fff73372b4b443d2920f09d2e83702fec07521a6 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 22 五月 2024 12:02:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/mindskip/xzs/service/UserService.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 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..833fb39 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.github.pagehelper.PageInfo; +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.domain.vo.UserVO; import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM; -import com.github.pagehelper.PageInfo; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -135,4 +136,12 @@ User getUserByRealName(String realName); void setStatus(UserVO user); + + User getUserByExam(ExamPaper examPaper); + + List<Integer> getDeptAdminIds(Integer id); + + List<Department> getDeptAdmins(Integer id); + + User getUserByExamByTemplateId(ExamPaper examPaper); } -- Gitblit v1.8.0