From f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 16:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/UserService.java | 13 ++++++++++---
1 files changed, 10 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..c2c44ba 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,10 @@
User getUserByRealName(String realName);
void setStatus(UserVO user);
+
+ User getUserByExam(ExamPaper examPaper);
+
+ List<Integer> getDeptAdminIds(Integer id);
+
+ List<Department> getDeptAdmins(Integer id);
}
--
Gitblit v1.8.0