From 161d73fef78ab215077a5f1e87d8b586f29c764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 23 五月 2024 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/UserService.java | 24 +++++++++++++++++++++---
1 files changed, 21 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 ca4ab52..c5dd26d 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -1,9 +1,11 @@
package com.mindskip.xzs.service;
-import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.User;
-import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
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.viewmodel.admin.user.UserPageRequestVM;
import java.util.List;
@@ -125,4 +127,20 @@
User selectByWxOpenId(String wxOpenId);
void changePicture(User user, String imagePath);
+
+ User selectByIdName(Integer id, String userName);
+
+ List<User> getUserByLevel(Integer userLevel);
+
+ User getUserByRealName(String realName);
+
+ void setStatus(User user);
+
+ User getUserByExam(ExamPaper examPaper);
+
+ List<Integer> getDeptAdminIds(Integer id);
+
+ List<Department> getDeptAdmins(Integer id);
+
+ User getUserByExamByTemplateId(ExamPaper examPaper);
}
--
Gitblit v1.8.0