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/impl/UserServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 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 59764ab..0282db7 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/UserServiceImpl.java
@@ -1,6 +1,9 @@
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;
@@ -107,8 +110,7 @@
@Override
@Transactional(rollbackFor = BusinessException.class)
public void insertUsers(List<User> users) {
- userMapper.insertUsers(users);
- throw new BusinessException("test BusinessException roll back");
+ userMapper.insertUsers(users);
}
@Override
@@ -157,4 +159,39 @@
changePictureUser.setImagePath(imagePath);
userMapper.updateByPrimaryKeySelective(changePictureUser);
}
+
+ @Override
+ public User selectByIdName(Integer id, String userName) {
+ return userMapper.selectByIdName(id,userName);
+ }
+
+ @Override
+ public List<User> getUserByLevel(Integer userLevel) {
+ return userMapper.getUserByLevel(userLevel);
+ }
+
+ @Override
+ public User getUserByRealName(String realName) {
+ return userMapper.getUserByRealName(realName);
+ }
+
+ @Override
+ public void setStatus(UserVO user) {
+ userMapper.setStatus(user);
+ }
+
+ @Override
+ public User getUserByExam(ExamPaper examPaper) {
+ return userMapper.getUserByExam(examPaper);
+ }
+
+ @Override
+ public List<Integer> getDeptAdminIds(Integer id) {
+ return userMapper.getDeptAdminIds(id);
+ }
+
+ @Override
+ public List<Department> getDeptAdmins(Integer id) {
+ return userMapper.getDeptAdmins(id);
+ }
}
--
Gitblit v1.8.0