From 7fd0771bbebafa36bc007ceb581cdaab4d290c82 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 09:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
index 23f0be5..77ae849 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/UserServiceImpl.java
@@ -6,6 +6,7 @@
import com.ycl.jxkg.domain.enums.UserStatusEnum;
import com.ycl.jxkg.domain.form.RegisterForm;
import com.ycl.jxkg.domain.other.KeyValue;
+import com.ycl.jxkg.domain.vo.StudentVO;
import com.ycl.jxkg.event.UserEvent;
import com.ycl.jxkg.exception.BusinessException;
import com.ycl.jxkg.domain.entity.User;
@@ -31,7 +32,6 @@
private final UserMapper userMapper;
private final ApplicationEventPublisher eventPublisher;
- private final AuthenticationService authenticationService;
public List<User> getUsers() {
@@ -146,7 +146,6 @@
User teacher = new User();
BeanUtils.copyProperties(form, teacher);
teacher.setRole(RoleEnum.ADMIN.getCode());
- teacher.setPassword(authenticationService.pwdEncode(form.getPassword()));
teacher.setUserUuid(UUID.randomUUID().toString());
teacher.setLastActiveTime(new Date());
teacher.setStatus(UserStatusEnum.Enable.getCode());
@@ -163,7 +162,6 @@
User student = new User();
BeanUtils.copyProperties(form, student);
student.setRole(RoleEnum.ADMIN.getCode());
- student.setPassword(authenticationService.pwdEncode(form.getPassword()));
student.setUserUuid(UUID.randomUUID().toString());
student.setLastActiveTime(new Date());
student.setStatus(UserStatusEnum.Enable.getCode());
@@ -174,4 +172,9 @@
userEventLog.setContent("娆㈣繋 " + student.getUserName() + " 娉ㄥ唽鏉ュ埌姹熻タ绌虹闊宠棰戝煿璁郴缁�");
eventPublisher.publishEvent(new UserEvent(userEventLog));
}
+
+ @Override
+ public List<StudentVO> classesStudent(Integer classesId) {
+ return userMapper.classesStudent(classesId);
+ }
}
--
Gitblit v1.8.0