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 | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 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 156f7f9..52814e7 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
@@ -1,17 +1,18 @@
package com.mindskip.xzs.service.impl;
-import com.mindskip.xzs.domain.Department;
-import com.mindskip.xzs.domain.ExamPaper;
-import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.vo.UserVO;
-import com.mindskip.xzs.exception.BusinessException;
-import com.mindskip.xzs.domain.User;
-import com.mindskip.xzs.event.OnRegistrationCompleteEvent;
-import com.mindskip.xzs.repository.UserMapper;
-import com.mindskip.xzs.service.UserService;
-import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
import com.github.pagehelper.PageHelper;
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.event.OnRegistrationCompleteEvent;
+import com.mindskip.xzs.exception.BusinessException;
+import com.mindskip.xzs.repository.UserMapper;
+import com.mindskip.xzs.service.UserService;
+import com.mindskip.xzs.utility.TreeUtils;
+import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
@@ -94,7 +95,7 @@
@Override
- public PageInfo<User> userPage(UserPageRequestVM requestVM) {
+ public PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM) {
return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
userMapper.userPage(requestVM)
);
@@ -176,7 +177,7 @@
}
@Override
- public void setStatus(UserVO user) {
+ public void setStatus(User user) {
userMapper.setStatus(user);
}
@@ -186,17 +187,38 @@
}
@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
public List<Department> getDeptAdmins(Integer id) {
- return userMapper.getDeptAdmins(id);
+ List<Department> list = userMapper.getDeptAdmins(id);
+ return TreeUtils.build(list);
}
@Override
public User getUserByExamByTemplateId(ExamPaper examPaper) {
return userMapper.getUserByExamByTemplateId(examPaper);
}
+
+ @Override
+ 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