From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/mindskip/xzs/service/UserService.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java
index 7c77c1a..a604df6 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -139,9 +139,33 @@
 
     User getUserByExam(ExamPaper examPaper);
 
-    List<Integer> getDeptAdminIds(Integer id);
+    List<Integer> getDeptAdminIds(Integer userId);
+
+    List<Department> getDeptAdminIdAndInfo(Integer userId);
 
     List<Department> getDeptAdmins(Integer id);
 
     User getUserByExamByTemplateId(ExamPaper examPaper);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛鎵�鍦ㄩ儴闂�
+     *
+     * @param id
+     * @return
+     */
+    List<Integer> getDeptIds(Integer id);
+
+    /**
+     * 鑾峰彇闇�瑕佽ˉ鑰冪殑鐢ㄦ埛
+     * @param examPaperId 璇曞嵎id
+     * @return 鐢ㄦ埛涓嬫媺
+     */
+    List<User> getFailExamUser(Integer examPaperId);
+
+    /**
+     * 鑾峰彇闇�瑕佽ˉ鑰冪殑鐢ㄦ埛
+     * @param templateId 闅忔満璇曞嵎id
+     * @return 鐢ㄦ埛涓嬫媺
+     */
+    List<User> getFailTemplateUser(Integer templateId);
 }

--
Gitblit v1.8.0