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/impl/UserServiceImpl.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
index 13d3696..52814e7 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
@@ -187,8 +187,13 @@
     }
 
     @Override
-    public List<Integer> getDeptAdminIds(Integer id) {
-        return userMapper.getDeptAdminIds(id);
+    public List<Integer> getDeptAdminIds(Integer userId) {
+        return userMapper.getDeptAdminIds(userId);
+    }
+
+    @Override
+    public List<Department> getDeptAdminIdAndInfo(Integer userId) {
+        return userMapper.getDeptAdminIdAndInfo(userId);
     }
 
     @Override
@@ -206,4 +211,14 @@
     public List<Integer> getDeptIds(Integer userId) {
         return userMapper.getDeptIds(userId);
     }
+
+    @Override
+    public List<User> getFailExamUser(Integer examPaperId) {
+        return userMapper.getFailExamUser(examPaperId);
+    }
+
+    @Override
+    public List<User> getFailTemplateUser(Integer templateId) {
+        return userMapper.getFailTemplateUser(templateId);
+    }
 }

--
Gitblit v1.8.0